fix pac

.github/issue_template.md

@@ -0,0 +1,25 @@
+在提出问题前请先自行排除服务器端问题，同时也请通过搜索确认是否有人提出过相同问题。
+
+### 预期行为
+描述你认为应该发生什么
+
+### 实际行为
+描述实际发生了什么
+
+### 复现方法
+1.
+2.
+3.
+
+### 日志信息,位置在当前目录下的guiLogs
+<details>
+
+```
+在这里粘贴日志
+```
+</details>
+
+### 环境信息
+
+### 额外信息（可选）
+

.gitignore

@@ -2,13 +2,14 @@
 # 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
 ################################################################################
 
-/v2rayN/.vs/v2rayN/v15
+/v2rayN/.vs/
 /v2rayN/v2rayN/bin/Debug/app.publish
 /v2rayN/v2rayN/bin/Debug
 /v2rayN/v2rayN/obj/Debug
 /v2rayN/.vs/v2rayN/DesignTimeBuild
 /v2rayN/v2rayN/bin/Release
 /v2rayN/v2rayN/obj/Release
+/v2rayN/packages
 .vs/ProjectSettings.json
 .vs/slnx.sqlite
 .vs/VSWorkspaceState.json

v2rayN/v2rayN/Base/HttpWebServer.cs

@@ -3,14 +3,14 @@ using System.Net;
 using System.Text;
 using System.Threading;
 
-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
     public class HttpWebServer
     {
         private HttpListener _listener;
-        private Func<HttpListenerRequest, string> _responderMethod;
+        private Func<string, string> _responderMethod;
 
-        public HttpWebServer(string[] prefixes, Func<HttpListenerRequest, string> method)
+        public HttpWebServer(string[] prefixes, Func<string, string> method)
         {
             try
             {
@@ -39,10 +39,11 @@ namespace v2rayN.HttpProxyHandler
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
+                throw;
             }
         }
 
-        public HttpWebServer(Func<HttpListenerRequest, string> method, params string[] prefixes)
+        public HttpWebServer(Func<string, string> method, params string[] prefixes)
             : this(prefixes, method) { }
 
         public void Run()
@@ -59,7 +60,9 @@ namespace v2rayN.HttpProxyHandler
                             var ctx = c as HttpListenerContext;
                             try
                             {
-                                string rstr = _responderMethod(ctx.Request);
+                                string address = ctx.Request.LocalEndPoint.Address.ToString();
+                                Utils.SaveLog("Webserver Request " + address);
+                                string rstr = _responderMethod(address);
                                 byte[] buf = Encoding.UTF8.GetBytes(rstr);
                                 ctx.Response.StatusCode = 200;
                                 ctx.Response.ContentType = "application/x-ns-proxy-autoconfig";

v2rayN/v2rayN/Base/HttpWebServerB.cs

@@ -0,0 +1,129 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace v2rayN.Base
+{
+    public class HttpWebServerB
+    {
+        private TcpListener listener;
+        private int port;
+        private Func<string, string> _responderMethod;
+
+        public HttpWebServerB(int port, Func<string, string> method)
+        {
+            this.port = port;
+            this._responderMethod = method;
+
+            Thread thread = new Thread(StartListen);
+            thread.IsBackground = true;
+            thread.Start();
+        }
+
+        public void Stop()
+        {
+            if (listener != null)
+            {
+                listener.Stop();
+                listener = null;
+            }
+        }
+
+        private void StartListen()
+        {
+            listener = new TcpListener(IPAddress.Any, port);
+            listener.Start();
+            Utils.SaveLog("WebserverB running...");
+
+            while (true)
+            {
+                if (!listener.Pending())
+                {
+                    continue;
+                }
+
+                TcpClient socket = listener.AcceptTcpClient();
+                Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
+                thread.IsBackground = true;
+                thread.Start(socket);
+                Thread.Sleep(1);
+            }
+        }
+        private void ProcessThread(object obj)
+        {
+            try
+            {
+                var socket = obj as TcpClient;
+
+                var inputStream = new BufferedStream(socket.GetStream());
+                var outputStream = new StreamWriter(new BufferedStream(socket.GetStream()));
+                if (inputStream.CanRead)
+                {
+                    var data = ReadStream(inputStream);
+
+                    if (data.Contains("/pac/"))
+                    {
+                        if (_responderMethod != null)
+                        {
+                            var address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            Utils.SaveLog("WebserverB Request " + address);
+                            string pac = _responderMethod(address);
+
+                            if (inputStream.CanWrite)
+                            {
+                                WriteStream(outputStream, pac);
+                            }
+                        }
+                    }
+                }
+
+                outputStream.BaseStream.Flush();
+                inputStream = null;
+                outputStream = null;
+                socket.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private string ReadStream(Stream inputStream)
+        {
+            int nextchar;
+            string data = "";
+            while (true)
+            {
+                nextchar = inputStream.ReadByte();
+                if (nextchar == '\n')
+                {
+                    break;
+                }
+                if (nextchar == '\r')
+                {
+                    continue;
+                }
+                if (nextchar == -1)
+                {
+                    Thread.Sleep(1);
+                    continue;
+                };
+                data += Convert.ToChar(nextchar);
+            }
+            return data;
+        }
+
+        private void WriteStream(StreamWriter outputStream, string pac)
+        {
+            var content_type = "application/x-ns-proxy-autoconfig";
+            outputStream.WriteLine("HTTP/1.1 200 OK");
+            outputStream.WriteLine(String.Format("Content-Type:{0}", content_type));
+            outputStream.WriteLine("Connection: close");
+            outputStream.WriteLine("");
+            outputStream.WriteLine(pac);
+            outputStream.Flush();
+        }
+    }
+}

v2rayN/v2rayN/Base/ListViewFlickerFree.cs

@@ -0,0 +1,56 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace v2rayN.Base
+{
+    class ListViewFlickerFree : ListView
+    {
+        public ListViewFlickerFree()
+        {
+            SetStyle(ControlStyles.OptimizedDoubleBuffer
+                    | ControlStyles.AllPaintingInWmPaint
+                    , true);
+            UpdateStyles();
+        }
+
+
+        public void AutoResizeColumns()
+        {
+            try
+            {
+                int count = this.Columns.Count;
+                int MaxWidth = 0;
+                Graphics graphics = this.CreateGraphics();
+                Font font = this.Font;
+                ListView.ListViewItemCollection items = this.Items;
+
+                string str;
+                int width;
+
+                this.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize);
+
+                for (int i = 0; i < count; i++)
+                {
+                    str = this.Columns[i].Text;
+                    MaxWidth = this.Columns[i].Width;
+
+                    foreach (ListViewItem item in items)
+                    {
+                        str = item.SubItems[i].Text;
+                        width = (int)graphics.MeasureString(str, font).Width;
+                        if (width > MaxWidth)
+                        {
+                            MaxWidth = width;
+                        }
+                    }
+                    if (i == 0)
+                    {
+                        this.Columns[i].Width = MaxWidth;
+                    }
+                    this.Columns[i].Width = MaxWidth;
+                }
+            }
+            catch { }
+        }
+    }
+}

v2rayN/v2rayN/Base/StringEx.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace v2rayN
+namespace v2rayN.Base
 {
     static class StringEx
     {
@@ -43,5 +43,10 @@ namespace v2rayN
                 yield return line;
             }
         }
+
+        public static string TrimEx(this string value)
+        {
+            return value == null ? string.Empty : value.Trim();
+        }
     }
 }

v2rayN/v2rayN/Base/WebClientEx.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Net;
+
+namespace v2rayN.Base
+{
+    class WebClientEx : WebClient
+    {
+        public int Timeout
+        {
+            get; set;
+        }
+        public WebClientEx(int timeout = 3000)
+        {
+            Timeout = timeout;
+        }
+
+        protected override WebRequest GetWebRequest(Uri address)
+        {
+            HttpWebRequest request;
+            if (address.Scheme == "https")
+            {
+                ServicePointManager.ServerCertificateValidationCallback = (a, b, c, d) => { return true; };
+                request = (HttpWebRequest)base.GetWebRequest(address);
+                request.ProtocolVersion = HttpVersion.Version10;
+            }
+            else
+            {
+                request = (HttpWebRequest)base.GetWebRequest(address);
+            }
+
+            request.Timeout = Timeout;
+            request.ReadWriteTimeout = Timeout;
+            //request.AllowAutoRedirect = false;
+            //request.AllowWriteStreamBuffering = true;
+
+            request.ServicePoint.BindIPEndPointDelegate = (servicePoint, remoteEndPoint, retryCount) =>
+            {
+                if (remoteEndPoint.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6)
+                    return new IPEndPoint(IPAddress.IPv6Any, 0);
+                else
+                    return new IPEndPoint(IPAddress.Any, 0);
+            };
+
+            return request;
+        }
+    }
+}

v2rayN/v2rayN/Forms/AddServer4Form.Designer.cs

@@ -31,6 +31,10 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServer4Form));
             this.btnClose = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtSecurity = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtId = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.txtRemarks = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -51,15 +55,18 @@
             // 
             // btnClose
             // 
-            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.Name = "btnClose";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.txtSecurity);
+            this.groupBox1.Controls.Add(this.label4);
+            this.groupBox1.Controls.Add(this.txtId);
+            this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Controls.Add(this.txtRemarks);
             this.groupBox1.Controls.Add(this.label6);
@@ -67,9 +74,30 @@
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.txtAddress);
             this.groupBox1.Controls.Add(this.label1);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
+            // txtSecurity
+            // 
+            resources.ApplyResources(this.txtSecurity, "txtSecurity");
+            this.txtSecurity.Name = "txtSecurity";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // txtId
+            // 
+            resources.ApplyResources(this.txtId, "txtId");
+            this.txtId.Name = "txtId";
+            // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
             // label13
             // 
             resources.ApplyResources(this.label13, "label13");
@@ -107,9 +135,9 @@
             // 
             // panel2
             // 
-            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
+            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
             // btnOK
@@ -126,22 +154,22 @@
             // 
             // menuServer
             // 
-            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.MenuItem1});
+            resources.ApplyResources(this.menuServer, "menuServer");
             this.menuServer.Name = "menuServer";
             // 
             // MenuItem1
             // 
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
             this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuItemImportClipboard});
             this.MenuItem1.Name = "MenuItem1";
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
             // 
             // menuItemImportClipboard
             // 
-            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
             this.menuItemImportClipboard.Name = "menuItemImportClipboard";
+            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
             this.menuItemImportClipboard.Click += new System.EventHandler(this.menuItemImportClipboard_Click);
             // 
             // AddServer4Form
@@ -184,5 +212,9 @@
         private System.Windows.Forms.MenuStrip menuServer;
         private System.Windows.Forms.ToolStripMenuItem MenuItem1;
         private System.Windows.Forms.ToolStripMenuItem menuItemImportClipboard;
+        private System.Windows.Forms.TextBox txtId;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txtSecurity;
+        private System.Windows.Forms.Label label4;
     }
 }

v2rayN/v2rayN/Forms/AddServer4Form.cs

@@ -36,6 +36,8 @@ namespace v2rayN.Forms
         {
             txtAddress.Text = vmessItem.address;
             txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id;
+            txtSecurity.Text = vmessItem.security;
             txtRemarks.Text = vmessItem.remarks;
         }
 
@@ -47,6 +49,8 @@ namespace v2rayN.Forms
         {
             txtAddress.Text = "";
             txtPort.Text = "";
+            txtId.Text = "";
+            txtSecurity.Text = "";
             txtRemarks.Text = "";
         }
 
@@ -54,6 +58,8 @@ namespace v2rayN.Forms
         {
             string address = txtAddress.Text;
             string port = txtPort.Text;
+            string id = txtId.Text;
+            string security = txtSecurity.Text;
             string remarks = txtRemarks.Text;
 
             if (Utils.IsNullOrEmpty(address))
@@ -69,6 +75,8 @@ namespace v2rayN.Forms
 
             vmessItem.address = address;
             vmessItem.port = Utils.ToInt(port);
+            vmessItem.id = id;
+            vmessItem.security = security;
             vmessItem.remarks = remarks;
 
             if (ConfigHandler.AddSocksServer(ref config, vmessItem, EditIndex) == 0)
@@ -112,6 +120,8 @@ namespace v2rayN.Forms
 
             txtAddress.Text = vmessItem.address;
             txtPort.Text = vmessItem.port.ToString();
+            txtSecurity.Text = vmessItem.security;
+            txtId.Text = vmessItem.id;
             txtRemarks.Text = vmessItem.remarks;
         }        
 

v2rayN/v2rayN/Forms/AddServer4Form.resx

@@ -117,367 +117,472 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>txtAddress</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</value>
   </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Server address</value>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
   </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 84</value>
+  </data>
+  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.Name" xml:space="preserve">
+    <value>txtSecurity</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtSecurity.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 88</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>User(Optional)</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 117</value>
+  </data>
+  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
+    <value>txtId</value>
+  </data>
+  <data name="&gt;&gt;txtId.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 121</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Password(Optional)</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>337, 158</value>
   </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
   </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="&gt;&gt;label13.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 154</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
   </data>
   <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
     <value>txtRemarks</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer4Form</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
   <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 158</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>5</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Alias (remarks)</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 154</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 60</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit or add a [Socks] server</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 21</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 10</value>
-  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
-  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 60</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
-  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 27</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 196</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 22</value>
-  </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
-    <value>txtPort</value>
-  </data>
-  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 56</value>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 158</value>
   </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 12</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
   </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 56</value>
+  </data>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 60</value>
   </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
   </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 31</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
   <data name="label2.Text" xml:space="preserve">
     <value>Server port</value>
   </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>337, 158</value>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
   </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+  <data name="&gt;&gt;label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 31</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 35</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 196</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 10</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>235, 22</value>
+  </data>
+  <data name="menuItemImportClipboard.Text" xml:space="preserve">
+    <value>Import URL from clipboard</value>
+  </data>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>162, 21</value>
+  </data>
   <data name="MenuItem1.Text" xml:space="preserve">
     <value>Import configuration file</value>
   </data>
   <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 25</value>
   </data>
-  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
+    <value>menuServer</value>
   </data>
   <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
     <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
-  </data>
-  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 231</value>
-  </data>
-  <data name="label13.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
-    <value>menuItemImportClipboard</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>396, 17</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Socks] server</value>
+  </data>
+  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
+    <value>MenuItem1</value>
+  </data>
+  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
+    <value>menuItemImportClipboard</value>
+  </data>
+  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>AddServer4Form</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx

@@ -123,10 +123,34 @@
   <data name="groupBox1.Text" xml:space="preserve">
     <value>服务器</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 85</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 89</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>用户名(可选)</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 115</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 119</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>密码(可选)</value>
+  </data>
   <data name="label13.Text" xml:space="preserve">
     <value>*手填,方便识别管理</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>83, 12</value>
   </data>

v2rayN/v2rayN/Forms/BaseForm.cs

@@ -35,5 +35,6 @@ namespace v2rayN.Forms
                 Utils.SaveLog($"Loading custom icon failed: {e.Message}");
             }
         }
+
     }
 }

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -31,7 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lvServers = new System.Windows.Forms.ListView();
+            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -41,6 +41,7 @@
             this.menuScanScreen = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.menuRemoveServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuRemoveDuplicateServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuCopyServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSetDefaultServer = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -51,14 +52,16 @@
             this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.menuPingServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuRealPingServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSpeedServer = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.menuExport2ClientConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
-            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
+            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
             this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem();
@@ -73,11 +76,22 @@
             this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
-            this.bgwPing = new System.ComponentModel.BackgroundWorker();
             this.bgwScan = new System.ComponentModel.BackgroundWorker();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.txtMsgBox = new System.Windows.Forms.TextBox();
+            this.ssMain = new System.Windows.Forms.StatusStrip();
+            this.toolSslSocksPortLab = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslSocksPort = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank1 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslHttpPortLab = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslHttpPort = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslPacPortLab = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslPacPort = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank3 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel();
             this.panel1 = new System.Windows.Forms.Panel();
             this.tsMain = new System.Windows.Forms.ToolStrip();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
@@ -111,6 +125,7 @@
             this.cmsMain.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
+            this.ssMain.SuspendLayout();
             this.tsMain.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -122,22 +137,21 @@
             // 
             // splitContainer1.Panel1
             // 
-            resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
             this.splitContainer1.Panel1.Controls.Add(this.lvServers);
             // 
             // splitContainer1.Panel2
             // 
-            resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
             this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl);
             this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
             // 
             // lvServers
             // 
-            resources.ApplyResources(this.lvServers, "lvServers");
             this.lvServers.ContextMenuStrip = this.cmsLv;
+            resources.ApplyResources(this.lvServers, "lvServers");
             this.lvServers.FullRowSelect = true;
             this.lvServers.GridLines = true;
             this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.lvServers.HideSelection = false;
             this.lvServers.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
             ((System.Windows.Forms.ListViewItem)(resources.GetObject("lvServers.Items")))});
             this.lvServers.MultiSelect = false;
@@ -150,7 +164,6 @@
             // 
             // cmsLv
             // 
-            resources.ApplyResources(this.cmsLv, "cmsLv");
             this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuAddVmessServer,
@@ -161,6 +174,7 @@
             this.menuScanScreen,
             this.toolStripSeparator1,
             this.menuRemoveServer,
+            this.menuRemoveDuplicateServer,
             this.menuCopyServer,
             this.menuSetDefaultServer,
             this.toolStripSeparator3,
@@ -171,6 +185,8 @@
             this.menuSelectAll,
             this.toolStripSeparator9,
             this.menuPingServer,
+            this.menuTcpingServer,
+            this.menuRealPingServer,
             this.menuSpeedServer,
             this.toolStripSeparator6,
             this.menuExport2ClientConfig,
@@ -179,169 +195,188 @@
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
             this.cmsLv.OwnerItem = this.tsbServer;
+            resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAddVmessServer
             // 
-            resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
             this.menuAddVmessServer.Name = "menuAddVmessServer";
+            resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
             this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click);
             // 
             // menuAddShadowsocksServer
             // 
-            resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
             this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
+            resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
             this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click);
             // 
             // menuAddSocksServer
             // 
-            resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
             this.menuAddSocksServer.Name = "menuAddSocksServer";
+            resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
             this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click);
             // 
             // menuAddCustomServer
             // 
-            resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
             this.menuAddCustomServer.Name = "menuAddCustomServer";
+            resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
             this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click);
             // 
             // menuAddServers
             // 
-            resources.ApplyResources(this.menuAddServers, "menuAddServers");
             this.menuAddServers.Name = "menuAddServers";
+            resources.ApplyResources(this.menuAddServers, "menuAddServers");
             this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen
             // 
-            resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
             this.menuScanScreen.Name = "menuScanScreen";
+            resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
             this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // toolStripSeparator1
             // 
-            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
             this.toolStripSeparator1.Name = "toolStripSeparator1";
+            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
             // 
             // menuRemoveServer
             // 
-            resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
             this.menuRemoveServer.Name = "menuRemoveServer";
+            resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
             this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click);
             // 
+            // menuRemoveDuplicateServer
+            // 
+            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
+            resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
+            this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click);
+            // 
             // menuCopyServer
             // 
-            resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
             this.menuCopyServer.Name = "menuCopyServer";
+            resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
             this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click);
             // 
             // menuSetDefaultServer
             // 
-            resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
             this.menuSetDefaultServer.Name = "menuSetDefaultServer";
+            resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
             this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
             // 
             // toolStripSeparator3
             // 
-            resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
             this.toolStripSeparator3.Name = "toolStripSeparator3";
+            resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
             // 
             // menuMoveTop
             // 
-            resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
             this.menuMoveTop.Name = "menuMoveTop";
+            resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
             this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
             // 
             // menuMoveUp
             // 
-            resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
             this.menuMoveUp.Name = "menuMoveUp";
+            resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
             this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
             // 
             // menuMoveDown
             // 
-            resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
             this.menuMoveDown.Name = "menuMoveDown";
+            resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
             this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
             // 
             // menuMoveBottom
             // 
-            resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
             this.menuMoveBottom.Name = "menuMoveBottom";
+            resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
             this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
             // 
             // menuSelectAll
             // 
-            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
             this.menuSelectAll.Name = "menuSelectAll";
+            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
             this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
             // 
             // toolStripSeparator9
             // 
-            resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
             this.toolStripSeparator9.Name = "toolStripSeparator9";
+            resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
             // 
             // menuPingServer
             // 
-            resources.ApplyResources(this.menuPingServer, "menuPingServer");
             this.menuPingServer.Name = "menuPingServer";
+            resources.ApplyResources(this.menuPingServer, "menuPingServer");
             this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
             // 
+            // menuTcpingServer
+            // 
+            this.menuTcpingServer.Name = "menuTcpingServer";
+            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
+            this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
+            // 
+            // menuRealPingServer
+            // 
+            this.menuRealPingServer.Name = "menuRealPingServer";
+            resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
+            this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
+            // 
             // menuSpeedServer
             // 
-            resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
             this.menuSpeedServer.Name = "menuSpeedServer";
+            resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
             this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
             // 
             // toolStripSeparator6
             // 
-            resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
             this.toolStripSeparator6.Name = "toolStripSeparator6";
+            resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
             // 
             // menuExport2ClientConfig
             // 
-            resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
             this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
+            resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
             this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click);
             // 
             // menuExport2ServerConfig
             // 
-            resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
             this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
+            resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
             this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click);
             // 
             // menuExport2ShareUrl
             // 
-            resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
             this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
+            resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
             this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
             // 
             // menuExport2SubContent
             // 
-            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
             this.menuExport2SubContent.Name = "menuExport2SubContent";
+            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
             this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
             // 
-            // tsbServer
-            // 
-            resources.ApplyResources(this.tsbServer, "tsbServer");
-            this.tsbServer.DropDown = this.cmsLv;
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            this.tsbServer.Name = "tsbServer";
-            // 
             // qrCodeControl
             // 
             resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
             this.qrCodeControl.Name = "qrCodeControl";
             // 
+            // tsbServer
+            // 
+            this.tsbServer.DropDown = this.cmsLv;
+            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+            resources.ApplyResources(this.tsbServer, "tsbServer");
+            this.tsbServer.Name = "tsbServer";
+            // 
             // notifyMain
             // 
-            resources.ApplyResources(this.notifyMain, "notifyMain");
             this.notifyMain.ContextMenuStrip = this.cmsMain;
+            resources.ApplyResources(this.notifyMain, "notifyMain");
             this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
             // 
             // cmsMain
             // 
-            resources.ApplyResources(this.cmsMain, "cmsMain");
             this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
+            resources.ApplyResources(this.cmsMain, "cmsMain");
             this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuSysAgentEnabled,
             this.menuSysAgentMode,
@@ -358,84 +393,78 @@
             // 
             // menuSysAgentEnabled
             // 
-            resources.ApplyResources(this.menuSysAgentEnabled, "menuSysAgentEnabled");
             this.menuSysAgentEnabled.Name = "menuSysAgentEnabled";
+            resources.ApplyResources(this.menuSysAgentEnabled, "menuSysAgentEnabled");
             this.menuSysAgentEnabled.Click += new System.EventHandler(this.menuSysAgentEnabled_Click);
             // 
             // menuSysAgentMode
             // 
-            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuGlobal,
             this.menuGlobalPAC,
             this.menuKeep,
             this.menuKeepPAC});
             this.menuSysAgentMode.Name = "menuSysAgentMode";
+            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             // 
             // menuGlobal
             // 
-            resources.ApplyResources(this.menuGlobal, "menuGlobal");
             this.menuGlobal.Name = "menuGlobal";
+            resources.ApplyResources(this.menuGlobal, "menuGlobal");
             this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
             // 
             // menuGlobalPAC
             // 
-            resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
             this.menuGlobalPAC.Name = "menuGlobalPAC";
+            resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
             this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click);
             // 
             // menuKeep
             // 
-            resources.ApplyResources(this.menuKeep, "menuKeep");
             this.menuKeep.Name = "menuKeep";
+            resources.ApplyResources(this.menuKeep, "menuKeep");
             this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click);
             // 
             // menuKeepPAC
             // 
-            resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
             this.menuKeepPAC.Name = "menuKeepPAC";
+            resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
             this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click);
             // 
             // menuServers
             // 
-            resources.ApplyResources(this.menuServers, "menuServers");
             this.menuServers.Name = "menuServers";
+            resources.ApplyResources(this.menuServers, "menuServers");
             // 
             // menuAddServers2
             // 
-            resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
             this.menuAddServers2.Name = "menuAddServers2";
+            resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
             this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen2
             // 
-            resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
             this.menuScanScreen2.Name = "menuScanScreen2";
+            resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
             this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // menuCopyPACUrl
             // 
-            resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
             this.menuCopyPACUrl.Name = "menuCopyPACUrl";
+            resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
             this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
             // 
             // toolStripSeparator2
             // 
-            resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
             this.toolStripSeparator2.Name = "toolStripSeparator2";
+            resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
             // 
             // menuExit
             // 
-            resources.ApplyResources(this.menuExit, "menuExit");
             this.menuExit.Name = "menuExit";
+            resources.ApplyResources(this.menuExit, "menuExit");
             this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
             // 
-            // bgwPing
-            // 
-            this.bgwPing.WorkerReportsProgress = true;
-            this.bgwPing.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bgwPing_DoWork);
-            this.bgwPing.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgwPing_ProgressChanged);
-            // 
             // bgwScan
             // 
             this.bgwScan.WorkerReportsProgress = true;
@@ -444,27 +473,105 @@
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.splitContainer1);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
             // groupBox2
             // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.txtMsgBox);
+            this.groupBox2.Controls.Add(this.ssMain);
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
             // txtMsgBox
             // 
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
             this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
             this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
             this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
             this.txtMsgBox.Name = "txtMsgBox";
             this.txtMsgBox.ReadOnly = true;
             // 
+            // ssMain
+            // 
+            this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolSslSocksPortLab,
+            this.toolSslSocksPort,
+            this.toolSslBlank1,
+            this.toolSslHttpPortLab,
+            this.toolSslHttpPort,
+            this.toolSslBlank2,
+            this.toolSslPacPortLab,
+            this.toolSslPacPort,
+            this.toolSslBlank3,
+            this.toolSslServerSpeed,
+            this.toolSslBlank4});
+            resources.ApplyResources(this.ssMain, "ssMain");
+            this.ssMain.Name = "ssMain";
+            this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
+            // 
+            // toolSslSocksPortLab
+            // 
+            resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab");
+            this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
+            // 
+            // toolSslSocksPort
+            // 
+            this.toolSslSocksPort.Name = "toolSslSocksPort";
+            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            // 
+            // toolSslBlank1
+            // 
+            resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1");
+            this.toolSslBlank1.Name = "toolSslBlank1";
+            this.toolSslBlank1.Spring = true;
+            // 
+            // toolSslHttpPortLab
+            // 
+            resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab");
+            this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
+            // 
+            // toolSslHttpPort
+            // 
+            this.toolSslHttpPort.Name = "toolSslHttpPort";
+            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
+            // 
+            // toolSslBlank2
+            // 
+            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
+            this.toolSslBlank2.Name = "toolSslBlank2";
+            this.toolSslBlank2.Spring = true;
+            // 
+            // toolSslPacPortLab
+            // 
+            resources.ApplyResources(this.toolSslPacPortLab, "toolSslPacPortLab");
+            this.toolSslPacPortLab.Name = "toolSslPacPortLab";
+            // 
+            // toolSslPacPort
+            // 
+            this.toolSslPacPort.Name = "toolSslPacPort";
+            resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
+            // 
+            // toolSslBlank3
+            // 
+            resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3");
+            this.toolSslBlank3.Name = "toolSslBlank3";
+            this.toolSslBlank3.Spring = true;
+            // 
+            // toolSslServerSpeed
+            // 
+            resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
+            this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.toolSslServerSpeed.Name = "toolSslServerSpeed";
+            // 
+            // toolSslBlank4
+            // 
+            this.toolSslBlank4.Name = "toolSslBlank4";
+            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            // 
             // panel1
             // 
             resources.ApplyResources(this.panel1, "panel1");
@@ -472,7 +579,6 @@
             // 
             // tsMain
             // 
-            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbServer,
@@ -489,50 +595,51 @@
             this.tsbPromotion,
             this.toolStripSeparator11,
             this.tsbClose});
+            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.Name = "tsMain";
             // 
             // toolStripSeparator4
             // 
-            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
             this.toolStripSeparator4.Name = "toolStripSeparator4";
+            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
             // 
             // tsbSub
             // 
-            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbSubSetting,
             this.tsbSubUpdate});
             this.tsbSub.Image = global::v2rayN.Properties.Resources.sub;
+            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.Name = "tsbSub";
             // 
             // tsbSubSetting
             // 
-            resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
             this.tsbSubSetting.Name = "tsbSubSetting";
+            resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
             this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click);
             // 
             // tsbSubUpdate
             // 
-            resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
             this.tsbSubUpdate.Name = "tsbSubUpdate";
+            resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
             this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
             // 
             // toolStripSeparator8
             // 
-            resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
             this.toolStripSeparator8.Name = "toolStripSeparator8";
+            resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
             // 
             // tsbOptionSetting
             // 
-            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
             this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
+            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
             this.tsbOptionSetting.Name = "tsbOptionSetting";
             this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
             // 
             // toolStripSeparator5
             // 
-            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
             this.toolStripSeparator5.Name = "toolStripSeparator5";
+            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
             // 
             // tsbReload
             // 
@@ -542,95 +649,95 @@
             // 
             // toolStripSeparator7
             // 
-            resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
             this.toolStripSeparator7.Name = "toolStripSeparator7";
+            resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
             // 
             // tsbCheckUpdate
             // 
-            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
             this.tsbCheckUpdatePACList,
             this.tsbCheckClearPACList});
             this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
+            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.Name = "tsbCheckUpdate";
             // 
             // tsbCheckUpdateN
             // 
-            resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
             this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
+            resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
             this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
             // 
             // tsbCheckUpdateCore
             // 
-            resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
             this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
+            resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
             this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
             // 
             // tsbCheckUpdatePACList
             // 
-            resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
             this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
+            resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
             this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
             // 
             // tsbCheckClearPACList
             // 
-            resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
             this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
+            resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
             this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click);
             // 
             // toolStripSeparator10
             // 
-            resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
             this.toolStripSeparator10.Name = "toolStripSeparator10";
+            resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
             // 
             // tsbHelp
             // 
-            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbAbout,
             this.toolStripSeparator12,
             this.tsbLanguageDef,
             this.tsbLanguageZhHans});
             this.tsbHelp.Image = global::v2rayN.Properties.Resources.help;
+            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.Name = "tsbHelp";
             // 
             // tsbAbout
             // 
-            resources.ApplyResources(this.tsbAbout, "tsbAbout");
             this.tsbAbout.Name = "tsbAbout";
+            resources.ApplyResources(this.tsbAbout, "tsbAbout");
             this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
             // 
             // toolStripSeparator12
             // 
-            resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
             this.toolStripSeparator12.Name = "toolStripSeparator12";
+            resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
             // 
             // tsbLanguageDef
             // 
-            resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
             this.tsbLanguageDef.Name = "tsbLanguageDef";
+            resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
             this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
             // 
             // tsbLanguageZhHans
             // 
-            resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
             this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
+            resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
             this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
             // 
             // tsbPromotion
             // 
-            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
             this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion;
+            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.Name = "tsbPromotion";
             this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
             // 
             // toolStripSeparator11
             // 
-            resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
             this.toolStripSeparator11.Name = "toolStripSeparator11";
+            resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
             // 
             // tsbClose
             // 
@@ -652,6 +759,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
             this.Load += new System.EventHandler(this.MainForm_Load);
             this.Shown += new System.EventHandler(this.MainForm_Shown);
+            this.VisibleChanged += new System.EventHandler(this.MainForm_VisibleChanged);
             this.Resize += new System.EventHandler(this.MainForm_Resize);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
@@ -662,6 +770,8 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
+            this.ssMain.ResumeLayout(false);
+            this.ssMain.PerformLayout();
             this.tsMain.ResumeLayout(false);
             this.tsMain.PerformLayout();
             this.ResumeLayout(false);
@@ -674,14 +784,13 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TextBox txtMsgBox;
-        private System.Windows.Forms.ListView lvServers;
+        private v2rayN.Base.ListViewFlickerFree lvServers;
         private System.Windows.Forms.NotifyIcon notifyMain;
         private System.Windows.Forms.ContextMenuStrip cmsMain;
         private System.Windows.Forms.ToolStripMenuItem menuExit;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.ToolStripMenuItem menuServers;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.ComponentModel.BackgroundWorker bgwPing;
         private System.Windows.Forms.ContextMenuStrip cmsLv;
         private System.Windows.Forms.ToolStripMenuItem menuAddVmessServer;
         private System.Windows.Forms.ToolStripMenuItem menuRemoveServer;
@@ -744,6 +853,21 @@
         private System.Windows.Forms.ToolStripMenuItem tsbLanguageZhHans;
         private System.Windows.Forms.ToolStripButton tsbPromotion;
         private System.Windows.Forms.ToolStripMenuItem menuAddSocksServer;
+        private System.Windows.Forms.StatusStrip ssMain;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPort;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPort;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank1;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslPacPort;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank3;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPortLab;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPortLab;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslPacPortLab;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank4;
+        private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
+        private System.Windows.Forms.ToolStripMenuItem menuTcpingServer;
+        private System.Windows.Forms.ToolStripMenuItem menuRealPingServer;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -1,12 +1,14 @@
 using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 using System.IO.Compression;
 using System.Text;
 using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.HttpProxyHandler;
 using v2rayN.Mode;
-using System.Collections.Generic;
-using System.IO;
+using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -14,9 +16,9 @@ namespace v2rayN.Forms
     {
         private V2rayHandler v2rayHandler;
         private PACListHandle pacListHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle2;
+        private DownloadHandle downloadHandle;
         private List<int> lvSelecteds = new List<int>();
+        private StatisticsHandler statistics = null;
 
         #region Window 事件
 
@@ -31,6 +33,14 @@ namespace v2rayN.Forms
             Application.ApplicationExit += (sender, args) =>
             {
                 Utils.ClearTempPath();
+
+                v2rayHandler.V2rayStop();
+                HttpProxyHandle.CloseHttpAgent(config);
+                PACServerHandle.Stop();
+
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
+                statistics?.Close();
             };
         }
 
@@ -40,12 +50,30 @@ namespace v2rayN.Forms
             v2rayHandler = new V2rayHandler();
             v2rayHandler.ProcessEvent += v2rayHandler_ProcessEvent;
 
+            if (config.enableStatistics)
+            {
+                statistics = new StatisticsHandler(config, UpdateStatisticsHandler);
+            }
+        }
+
+        private void MainForm_VisibleChanged(object sender, EventArgs e)
+        {
+            if (statistics == null || !statistics.Enable) return;
+            if ((sender as Form).Visible)
+            {
+                statistics.UpdateUI = true;
+            }
+            else
+            {
+                statistics.UpdateUI = false;
+            }
         }
 
         private void MainForm_Shown(object sender, EventArgs e)
         {
             InitServersView();
             RefreshServers();
+            lvServers.AutoResizeColumns();
 
             LoadV2ray();
 
@@ -58,10 +86,9 @@ namespace v2rayN.Forms
             if (e.CloseReason == CloseReason.UserClosing)
             {
                 e.Cancel = true;
-
                 HideForm();
                 return;
-            }
+            } 
         }
 
         private void MainForm_Resize(object sender, EventArgs e)
@@ -81,21 +108,24 @@ namespace v2rayN.Forms
             //config.uiItem.mainQRCodeWidth = splitContainer1.SplitterDistance;
         }
 
-
-        //private const int WM_QUERYENDSESSION = 0x0011;
-        //protected override void WndProc(ref Message m)
-        //{
-        //    switch (m.Msg)
-        //    {
-        //        case WM_QUERYENDSESSION:
-        //            CloseV2ray();
-        //            m.Result = (IntPtr)1;
-        //            break;
-        //        default:
-        //            base.WndProc(ref m);
-        //            break;
-        //    }
-        //}
+        private const int WM_QUERYENDSESSION = 0x0011;
+        protected override void WndProc(ref Message m)
+        {
+            switch (m.Msg)
+            {
+                case WM_QUERYENDSESSION:
+                    Utils.SaveLog("Windows shutdown UnsetProxy");
+                 
+                    ConfigHandler.ToJsonFile(config);
+                    statistics?.SaveToFile();
+                    ProxySetting.UnsetProxy();
+                    m.Result = (IntPtr)1;
+                    break;
+                default:
+                    base.WndProc(ref m);
+                    break;
+            }
+        }
         #endregion
 
         #region 显示服务器 listview 和 menu
@@ -131,8 +161,15 @@ namespace v2rayN.Forms
             lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 90, HorizontalAlignment.Left);
             lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 70, HorizontalAlignment.Left);
             lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 50, HorizontalAlignment.Left);
-            lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 100, HorizontalAlignment.Left);
+            lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 70, HorizontalAlignment.Left);
 
+            if (statistics != null && statistics.Enable)
+            {
+                lvServers.Columns.Add(UIRes.I18N("LvTotalUploadDataAmount"), 70, HorizontalAlignment.Left);
+                lvServers.Columns.Add(UIRes.I18N("LvTotalDownloadDataAmount"), 70, HorizontalAlignment.Left);
+                lvServers.Columns.Add(UIRes.I18N("LvTodayUploadDataAmount"), 70, HorizontalAlignment.Left);
+                lvServers.Columns.Add(UIRes.I18N("LvTodayDownloadDataAmount"), 70, HorizontalAlignment.Left);
+            }
         }
 
         /// <summary>
@@ -145,14 +182,52 @@ namespace v2rayN.Forms
             for (int k = 0; k < config.vmess.Count; k++)
             {
                 string def = string.Empty;
+                string totalUp = string.Empty,
+                        totalDown = string.Empty,
+                        todayUp = string.Empty,
+                        todayDown = string.Empty;
                 if (config.index.Equals(k))
                 {
                     def = "√";
                 }
 
                 VmessItem item = config.vmess[k];
-                ListViewItem lvItem = new ListViewItem(new string[]
+
+                ListViewItem lvItem = null;
+                if (statistics != null && statistics.Enable)
                 {
+                    var index = statistics.Statistic.FindIndex(item_ => item_.address == item.address);
+                    if (index != -1)
+                    {
+                        totalUp = Utils.HumanFy(statistics.Statistic[index].totalUp);
+                        totalDown = Utils.HumanFy(statistics.Statistic[index].totalDown);
+                        todayUp = Utils.HumanFy(statistics.Statistic[index].todayUp);
+                        todayDown = Utils.HumanFy(statistics.Statistic[index].todayDown);
+                    }
+
+                    lvItem = new ListViewItem(new string[]
+                    {
+                    def,
+                    ((EConfigType)item.configType).ToString(),
+                    item.remarks,
+                    item.address,
+                    item.port.ToString(),
+                    //item.id,
+                    //item.alterId.ToString(),
+                    item.security,
+                    item.network,
+                    item.getSubRemarks(config),
+                    item.testResult,
+                    totalUp,
+                    totalDown,
+                    todayUp,
+                    todayDown
+                    });
+                }
+                else
+                {
+                    lvItem = new ListViewItem(new string[]
+                   {
                     def,
                     ((EConfigType)item.configType).ToString(),
                     item.remarks,
@@ -164,8 +239,14 @@ namespace v2rayN.Forms
                     item.network,
                     item.getSubRemarks(config),
                     item.testResult
-                });
-                lvServers.Items.Add(lvItem);
+                    //totalUp,
+                    //totalDown,
+                    //todayUp,
+                    //todayDown,
+                   });
+                }
+
+                if (lvItem != null) lvServers.Items.Add(lvItem);
             }
 
             //if (lvServers.Items.Count > 0)
@@ -235,6 +316,79 @@ namespace v2rayN.Forms
             qrCodeControl.showQRCode(index, config);
         }
 
+        private void DisplayToolStatus()
+        {
+            toolSslSocksPort.Text =
+            toolSslHttpPort.Text =
+            toolSslPacPort.Text = "NONE";
+
+            toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}";
+
+            if (config.sysAgentEnabled)
+            {
+                toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
+                if (config.listenerType == 2 || config.listenerType == 4)
+                {
+                    if (PACServerHandle.IsRunning)
+                    {
+                        toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}";
+                    }
+                    else
+                    {
+                        toolSslPacPort.Text = UIRes.I18N("StartPacFailed");
+                    }
+                }
+            }
+            notifyMain.Icon = GetNotifyIcon();
+
+        }
+        private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+        {
+            if (!Utils.IsNullOrEmpty(e.ClickedItem.Text))
+            {
+                Utils.SetClipboardData(e.ClickedItem.Text);
+            }
+        }
+
+        private Icon GetNotifyIcon()
+        {
+            try
+            {
+                var color = ColorTranslator.FromHtml("#3399CC");
+                var index = config.sysAgentEnabled ? config.listenerType : 0;
+                if (index > 0)
+                {
+                    color = (new Color[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange })[index - 1];
+                    //color = ColorTranslator.FromHtml(new string[] { "#CC0066", "#CC6600", "#99CC99", "#666699" }[index - 1]);
+                }
+
+                var width = 128;
+                var height = 128;
+
+                var bitmap = new Bitmap(width, height);
+                var graphics = Graphics.FromImage(bitmap);
+                var drawBrush = new SolidBrush(color);
+
+                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
+                var zoom = 16;
+                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+
+                bitmap.Save(Utils.GetPath("temp_icon.ico"), System.Drawing.Imaging.ImageFormat.Icon);
+
+                Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
+
+                drawBrush.Dispose();
+                graphics.Dispose();
+                bitmap.Dispose();
+
+                return createdIcon;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return this.Icon;
+            }
+        }
         #endregion
 
         #region v2ray 操作
@@ -250,8 +404,10 @@ namespace v2rayN.Forms
             }
             v2rayHandler.LoadV2ray(config);
             Global.reloadV2ray = false;
+            ConfigHandler.ToJsonFile(config);
 
             ChangeSysAgent(config.sysAgentEnabled);
+            DisplayToolStatus();
         }
 
         /// <summary>
@@ -331,6 +487,18 @@ namespace v2rayN.Forms
                     case Keys.A:
                         menuSelectAll_Click(null, null);
                         break;
+                    case Keys.P:
+                        menuPingServer_Click(null, null);
+                        break;
+                    case Keys.O:
+                        menuTcpingServer_Click(null, null);
+                        break;
+                    case Keys.R:
+                        menuRealPingServer_Click(null, null);
+                        break;
+                    case Keys.T:
+                        menuSpeedServer_Click(null, null);
+                        break;
                 }
             }
             switch (e.KeyCode)
@@ -384,6 +552,19 @@ namespace v2rayN.Forms
 
         }
 
+        private void menuRemoveDuplicateServer_Click(object sender, EventArgs e)
+        {
+            List<Mode.VmessItem> servers = null;
+            Utils.DedupServerList(config.vmess, out servers);
+            if (servers != null)
+            {
+                config.vmess = servers;
+            }
+            //刷新
+            RefreshServers();
+            LoadV2ray();
+        }
+
         private void menuCopyServer_Click(object sender, EventArgs e)
         {
             int index = GetLvSelectedIndex();
@@ -413,12 +594,18 @@ namespace v2rayN.Forms
         {
             GetLvSelectedIndex();
             ClearTestResult();
-            bgwPing.RunWorkerAsync();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "ping", UpdateSpeedtestHandler);
+        }
+        private void menuTcpingServer_Click(object sender, EventArgs e)
+        {
+            GetLvSelectedIndex();
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "tcping", UpdateSpeedtestHandler);
         }
 
-        private void menuSpeedServer_Click(object sender, EventArgs e)
+        private void menuRealPingServer_Click(object sender, EventArgs e)
         {
-            if (!config.sysAgentEnabled || config.listenerType != 1)
+            if (!config.sysAgentEnabled)
             {
                 UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
                 return;
@@ -427,7 +614,22 @@ namespace v2rayN.Forms
             UI.Show(UIRes.I18N("SpeedServerTips"));
 
             GetLvSelectedIndex();
-            ServerSpeedTest();
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "realping", UpdateSpeedtestHandler);
+        }
+
+        private void menuSpeedServer_Click(object sender, EventArgs e)
+        {
+            if (!config.sysAgentEnabled)
+            {
+                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+                return;
+            }
+
+            UI.Show(UIRes.I18N("SpeedServerTips"));
+
+            GetLvSelectedIndex();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "speedtest", UpdateSpeedtestHandler);
         }
 
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -802,13 +1004,11 @@ namespace v2rayN.Forms
         }
 
         private void menuExit_Click(object sender, EventArgs e)
-        {
-            CloseV2ray();
+        {        
 
             this.Visible = false;
-            this.Close();
-            //this.Dispose();
-            //System.Environment.Exit(System.Environment.ExitCode);
+            this.Close();            
+             
             Application.Exit();
         }
 
@@ -828,7 +1028,7 @@ namespace v2rayN.Forms
         {
             //this.WindowState = FormWindowState.Minimized;
             this.Hide();
-            this.notifyMain.Icon = this.Icon;
+            //this.notifyMain.Icon = this.Icon;
             this.notifyMain.Visible = true;
             this.ShowInTaskbar = false;
 
@@ -839,42 +1039,10 @@ namespace v2rayN.Forms
 
         #region 后台测速
 
-        private void bgwPing_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
-        {
-            try
-            {
-                for (int k = 0; k < lvSelecteds.Count; k++)
-                {
-                    int index = lvSelecteds[k];
-                    if (config.vmess[index].configType == (int)EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    long time = Utils.Ping(config.vmess[index].address);
-                    bgwPing.ReportProgress(index, string.Format("{0}ms", time));
-                }
-            }
-            catch
-            {
-            }
-        }
-
-        private void bgwPing_ProgressChanged(object sender, System.ComponentModel.ProgressChangedEventArgs e)
-        {
-            try
-            {
-                int k = e.ProgressPercentage;
-                string time = string.Format("{0}", Convert.ToString(e.UserState));
-                SetTestResult(k, time);
-            }
-            catch
-            {
-            }
-        }
         private void SetTestResult(int k, string txt)
         {
             config.vmess[k].testResult = txt;
-            lvServers.Items[k].SubItems[lvServers.Items[k].SubItems.Count - 1].Text = txt;
+            lvServers.Items[k].SubItems[8].Text = txt;
         }
         private void ClearTestResult()
         {
@@ -883,77 +1051,70 @@ namespace v2rayN.Forms
                 SetTestResult(k, "");
             }
         }
-
-        private int testCounter = 0;
-        private int ServerSpeedTestSub(int index, string url)
+        private void UpdateSpeedtestHandler(int index, string msg)
         {
-            if (index >= lvSelecteds.Count)
+            lvServers.Invoke((MethodInvoker)delegate
             {
-                return -1;
-            }
+                lvServers.SuspendLayout();
 
-            if (ConfigHandler.SetDefaultServer(ref config, lvSelecteds[index]) == 0)
-            {
-                SetTestResult(lvSelecteds[index], "testing...");
+                SetTestResult(index, msg);
 
-                v2rayHandler.LoadV2ray(config);
-                v2rayUpdateHandle2.DownloadFileAsync(config, url);
-                testCounter++;
-                return 0;
-            }
-            else
+                lvServers.ResumeLayout();
+            });
+        }
+
+        private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, ulong down, List<Mode.ServerStatistics> statistics)
+        {
+            try
             {
-                return -1;
+                up /= (ulong)(config.statisticsFreshRate / 1000f);
+                down /= (ulong)(config.statisticsFreshRate / 1000f);
+                toolSslServerSpeed.Text = string.Format(
+                    "{0}/s↑ | {1}/s↓",
+                      Utils.HumanFy(up),
+                      Utils.HumanFy(down)
+                );
+
+                List<string[]> datas = new List<string[]>();
+                for (int i = 0; i < config.vmess.Count; i++)
+                {
+                    string totalUp_ = string.Empty,
+                            totalDown_ = string.Empty,
+                            todayUp_ = string.Empty,
+                            todayDown_ = string.Empty;
+                    var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0)));
+                    if (index != -1)
+                    {
+                        totalUp_ = Utils.HumanFy(statistics[index].totalUp);
+                        totalDown_ = Utils.HumanFy(statistics[index].totalDown);
+                        todayUp_ = Utils.HumanFy(statistics[index].todayUp);
+                        todayDown_ = Utils.HumanFy(statistics[index].todayDown);
+                    }
+
+                    datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ });
+                }
+
+                lvServers.Invoke((MethodInvoker)delegate
+                {
+                    lvServers.SuspendLayout();
+                    for (int i = 0; i < datas.Count; i++)
+                    {
+                        var indexStart = 9;
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][0];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][1];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][2];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][3];
+                    }
+                    lvServers.ResumeLayout();
+                });
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
             }
         }
-        private void ServerSpeedTest()
-        {
-            if (config.vmess.Count <= 0)
-            {
-                return;
-            }
-            ClearTestResult();
 
-            string url = Global.SpeedTestUrl;
-            testCounter = 0;
-            if (v2rayUpdateHandle2 == null)
-            {
-                v2rayUpdateHandle2 = new V2rayUpdateHandle();
-                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
-                {
-                    if (args.Success)
-                    {
-                        AppendText(false, args.Msg);
-                        SetTestResult(lvSelecteds[testCounter - 1], args.Msg);
-
-                        if (ServerSpeedTestSub(testCounter, url) != 0)
-                        {
-                            RefreshServers();
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                v2rayUpdateHandle2.Error += (sender2, args) =>
-                {
-                    SetTestResult(lvSelecteds[testCounter - 1], args.GetException().Message);
-                    AppendText(true, args.GetException().Message);
-
-                    if (ServerSpeedTestSub(testCounter, url) != 0)
-                    {
-                        RefreshServers();
-                        return;
-                    }
-                };
-            }
-            if (ServerSpeedTestSub(testCounter, url) != 0)
-            {
-                return;
-            }
-        }
         #endregion
 
         #region 移动服务器
@@ -1073,7 +1234,7 @@ namespace v2rayN.Forms
                         break;
                 }
             }
-
+            DisplayToolStatus();
         }
 
         /// <summary>
@@ -1084,7 +1245,7 @@ namespace v2rayN.Forms
         {
             if (isChecked)
             {
-                if (HttpProxyHandle.RestartHttpAgent(config, true))
+                if (HttpProxyHandle.RestartHttpAgent(config, false))
                 {
                     ChangePACButtonStatus(config.listenerType);
                 }
@@ -1097,6 +1258,8 @@ namespace v2rayN.Forms
 
             menuSysAgentEnabled.Checked =
             menuSysAgentMode.Enabled = isChecked;
+
+            DisplayToolStatus();
         }
         #endregion
 
@@ -1110,10 +1273,10 @@ namespace v2rayN.Forms
 
         private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
         {
-            if (v2rayUpdateHandle == null)
+            if (downloadHandle == null)
             {
-                v2rayUpdateHandle = new V2rayUpdateHandle();
-                v2rayUpdateHandle.AbsoluteCompleted += (sender2, args) =>
+                downloadHandle = new DownloadHandle();
+                downloadHandle.AbsoluteCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1129,7 +1292,7 @@ namespace v2rayN.Forms
                             }
                             else
                             {
-                                v2rayUpdateHandle.DownloadFileAsync(config, url);
+                                downloadHandle.DownloadFileAsync(config, url, null);
                             }
                         }));
                     }
@@ -1138,7 +1301,7 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle.UpdateCompleted += (sender2, args) =>
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1149,7 +1312,7 @@ namespace v2rayN.Forms
                         {
                             CloseV2ray();
 
-                            string fileName = v2rayUpdateHandle.DownloadFileName;
+                            string fileName = downloadHandle.DownloadFileName;
                             fileName = Utils.GetPath(fileName);
                             using (ZipArchive archive = ZipFile.OpenRead(fileName))
                             {
@@ -1177,14 +1340,14 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
             }
 
             AppendText(false, UIRes.I18N("MsgStartUpdatingV2rayCore"));
-            v2rayUpdateHandle.AbsoluteV2rayCore(config);
+            downloadHandle.AbsoluteV2rayCore(config);
         }
 
         private void tsbCheckUpdatePACList_Click(object sender, EventArgs e)
@@ -1254,7 +1417,7 @@ namespace v2rayN.Forms
             ShowForm();
 
             string result = Convert.ToString(e.UserState);
-            if (string.IsNullOrEmpty(result))
+            if (Utils.IsNullOrEmpty(result))
             {
                 UI.Show(UIRes.I18N("NoValidQRcodeFound"));
             }
@@ -1291,8 +1454,8 @@ namespace v2rayN.Forms
 
             for (int k = 1; k <= config.subItem.Count; k++)
             {
-                string id = config.subItem[k - 1].id.Trim();
-                string url = config.subItem[k - 1].url.Trim();
+                string id = config.subItem[k - 1].id.TrimEx();
+                string url = config.subItem[k - 1].url.TrimEx();
                 string hashCode = $"{k}->";
                 if (config.subItem[k - 1].enabled == false)
                 {
@@ -1304,8 +1467,8 @@ namespace v2rayN.Forms
                     continue;
                 }
 
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle3 = new DownloadHandle();
+                downloadHandle3.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1334,12 +1497,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle3.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                v2rayUpdateHandle3.WebDownloadString(url);
+                downloadHandle3.WebDownloadString(url);
                 AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
             }
 
@@ -1364,7 +1527,9 @@ namespace v2rayN.Forms
             Utils.RegWriteValue(Global.MyRegPath, Global.MyRegKeyLanguage, value);
         }
 
+
         #endregion
 
+
     }
 }

v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx

@@ -119,145 +119,157 @@
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuAddVmessServer.Text" xml:space="preserve">
     <value>添加[VMess]服务器</value>
   </data>
   <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuAddShadowsocksServer.Text" xml:space="preserve">
     <value>添加[Shadowsocks]服务器</value>
   </data>
   <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuAddSocksServer.Text" xml:space="preserve">
     <value>添加[Socks]服务器</value>
   </data>
   <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuAddCustomServer.Text" xml:space="preserve">
     <value>添加自定义配置服务器</value>
   </data>
   <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuAddServers.Text" xml:space="preserve">
     <value>从剪贴板导入批量URL</value>
   </data>
   <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuScanScreen.Text" xml:space="preserve">
     <value>扫描屏幕上的二维码</value>
   </data>
   <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
   </data>
   <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuRemoveServer.Text" xml:space="preserve">
     <value>移除所选服务器(多选)   (Delete)</value>
   </data>
+  <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 22</value>
+  </data>
+  <data name="menuRemoveDuplicateServer.Text" xml:space="preserve">
+    <value>移除重复的服务器</value>
+  </data>
   <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuCopyServer.Text" xml:space="preserve">
     <value>复制所选服务器</value>
   </data>
   <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuSetDefaultServer.Text" xml:space="preserve">
     <value>设为活动服务器   (Enter)</value>
   </data>
   <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
   </data>
   <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuMoveTop.Text" xml:space="preserve">
     <value>上移至顶</value>
   </data>
   <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuMoveUp.Text" xml:space="preserve">
     <value>上移      (U)</value>
   </data>
   <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuMoveDown.Text" xml:space="preserve">
     <value>下移      (D)</value>
   </data>
   <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuMoveBottom.Text" xml:space="preserve">
     <value>下移至底</value>
   </data>
   <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuSelectAll.Text" xml:space="preserve">
     <value>全选      (Ctrl+A)</value>
   </data>
   <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
   </data>
   <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuPingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟(多选)</value>
+    <value>测试服务器延迟Ping(多选)(Ctrl+P)</value>
+  </data>
+  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 22</value>
+  </data>
+  <data name="menuTcpingServer.Text" xml:space="preserve">
+    <value>测试服务器延迟Tcping(多选)(Ctrl+O)</value>
+  </data>
+  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 22</value>
+  </data>
+  <data name="menuRealPingServer.Text" xml:space="preserve">
+    <value>测试服务器真连接延迟(多选)(Ctrl+R)</value>
   </data>
   <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuSpeedServer.Text" xml:space="preserve">
-    <value>测试服务器速度(多选)</value>
+    <value>测试服务器速度(多选)(Ctrl+T)</value>
   </data>
   <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
   </data>
   <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuExport2ClientConfig.Text" xml:space="preserve">
     <value>导出所选服务器为客户端配置</value>
   </data>
   <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuExport2ServerConfig.Text" xml:space="preserve">
     <value>导出所选服务器为服务端配置</value>
   </data>
   <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuExport2ShareUrl.Text" xml:space="preserve">
     <value>批量导出分享URL至剪贴板(多选)</value>
   </data>
   <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
   </data>
   <data name="menuExport2SubContent.Text" xml:space="preserve">
     <value>批量导出订阅内容至剪贴板(多选)</value>
   </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>  服务器  </value>
-  </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 468</value>
+    <value>279, 534</value>
   </data>
   <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -276,12 +288,27 @@
         ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
   </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>  服务器  </value>
+  </data>
+  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>196, 164</value>
+  </data>
   <data name="menuSysAgentEnabled.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
   <data name="menuSysAgentEnabled.Text" xml:space="preserve">
     <value>启用Http代理</value>
   </data>
+  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>195, 22</value>
+  </data>
+  <data name="menuSysAgentMode.Text" xml:space="preserve">
+    <value>Http代理模式</value>
+  </data>
   <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
     <value>340, 22</value>
   </data>
@@ -306,12 +333,6 @@
   <data name="menuKeepPAC.Text" xml:space="preserve">
     <value>仅开启PAC,不自动配置PAC</value>
   </data>
-  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuSysAgentMode.Text" xml:space="preserve">
-    <value>Http代理模式</value>
-  </data>
   <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
@@ -345,15 +366,21 @@
   <data name="menuExit.Text" xml:space="preserve">
     <value>退出</value>
   </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 164</value>
-  </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>服务器列表</value>
   </data>
   <data name="groupBox2.Text" xml:space="preserve">
     <value>信息</value>
   </data>
+  <data name="toolSslServerSpeed.Text" xml:space="preserve">
+    <value>网速显示未启用</value>
+  </data>
+  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 53</value>
+  </data>
+  <data name="tsbSub.Text" xml:space="preserve">
+    <value>  订阅  </value>
+  </data>
   <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>124, 22</value>
   </data>
@@ -366,12 +393,6 @@
   <data name="tsbSubUpdate.Text" xml:space="preserve">
     <value>更新订阅</value>
   </data>
-  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 53</value>
-  </data>
-  <data name="tsbSub.Text" xml:space="preserve">
-    <value>  订阅  </value>
-  </data>
   <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>76, 53</value>
   </data>
@@ -395,6 +416,12 @@
   <data name="tsbReload.Text" xml:space="preserve">
     <value>  重启服务  </value>
   </data>
+  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 53</value>
+  </data>
+  <data name="tsbCheckUpdate.Text" xml:space="preserve">
+    <value>  检查更新  </value>
+  </data>
   <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
     <value>232, 22</value>
   </data>
@@ -419,21 +446,15 @@
   <data name="tsbCheckClearPACList.Text" xml:space="preserve">
     <value>简化PAC (请设置Core路由)</value>
   </data>
-  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 53</value>
-  </data>
-  <data name="tsbCheckUpdate.Text" xml:space="preserve">
-    <value>  检查更新  </value>
-  </data>
-  <data name="tsbAbout.Text" xml:space="preserve">
-    <value>关于</value>
-  </data>
   <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 53</value>
   </data>
   <data name="tsbHelp.Text" xml:space="preserve">
     <value>   帮助   </value>
   </data>
+  <data name="tsbAbout.Text" xml:space="preserve">
+    <value>关于</value>
+  </data>
   <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
     <value>68, 53</value>
   </data>

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -62,8 +62,9 @@
             this.txtUserblock = new System.Windows.Forms.TextBox();
             this.panel3 = new System.Windows.Forms.Panel();
             this.btnSetDefRountingRule = new System.Windows.Forms.Button();
-            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
             this.labRoutingTips = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.cmbroutingMode = new System.Windows.Forms.ComboBox();
@@ -82,6 +83,11 @@
             this.txtKcpmtu = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.cbFreshrate = new System.Windows.Forms.ComboBox();
+            this.tbCacheDays = new System.Windows.Forms.TextBox();
+            this.lbFreshrate = new System.Windows.Forms.Label();
+            this.lbCacheDays = new System.Windows.Forms.Label();
+            this.chkEnableStatistics = new System.Windows.Forms.CheckBox();
             this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
             this.txturlGFWList = new System.Windows.Forms.TextBox();
             this.label13 = new System.Windows.Forms.Label();
@@ -106,31 +112,32 @@
             // 
             // btnClose
             // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnClose.Name = "btnClose";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // tabControl1
             // 
+            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage6);
             this.tabControl1.Controls.Add(this.tabPage7);
-            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             // 
             // tabPage1
             // 
-            this.tabPage1.Controls.Add(this.groupBox1);
             resources.ApplyResources(this.tabPage1, "tabPage1");
+            this.tabPage1.Controls.Add(this.groupBox1);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // groupBox1
             // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.chksniffingEnabled2);
             this.groupBox1.Controls.Add(this.chksniffingEnabled);
             this.groupBox1.Controls.Add(this.txtremoteDNS);
@@ -149,7 +156,6 @@
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.txtlocalPort);
             this.groupBox1.Controls.Add(this.label2);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
@@ -196,12 +202,12 @@
             // 
             // cmbprotocol2
             // 
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol2.FormattingEnabled = true;
             this.cmbprotocol2.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol2.Items"),
             resources.GetString("cmbprotocol2.Items1")});
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.Name = "cmbprotocol2";
             // 
             // label3
@@ -216,8 +222,8 @@
             // 
             // cmbprotocol
             // 
-            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol.FormattingEnabled = true;
             this.cmbprotocol.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol.Items"),
@@ -243,6 +249,7 @@
             // 
             // cmbloglevel
             // 
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbloglevel.FormattingEnabled = true;
             this.cmbloglevel.Items.AddRange(new object[] {
@@ -251,7 +258,6 @@
             resources.GetString("cmbloglevel.Items2"),
             resources.GetString("cmbloglevel.Items3"),
             resources.GetString("cmbloglevel.Items4")});
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.Name = "cmbloglevel";
             // 
             // label5
@@ -271,32 +277,32 @@
             // 
             // tabPage2
             // 
-            this.tabPage2.Controls.Add(this.groupBox2);
             resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.groupBox2);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // groupBox2
             // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.tabControl2);
             this.groupBox2.Controls.Add(this.panel3);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
             // tabControl2
             // 
+            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Controls.Add(this.tabPage3);
             this.tabControl2.Controls.Add(this.tabPage4);
             this.tabControl2.Controls.Add(this.tabPage5);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Name = "tabControl2";
             this.tabControl2.SelectedIndex = 0;
             // 
             // tabPage3
             // 
-            this.tabPage3.Controls.Add(this.txtUseragent);
             resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Controls.Add(this.txtUseragent);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
@@ -307,8 +313,8 @@
             // 
             // tabPage4
             // 
-            this.tabPage4.Controls.Add(this.txtUserdirect);
             resources.ApplyResources(this.tabPage4, "tabPage4");
+            this.tabPage4.Controls.Add(this.txtUserdirect);
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.UseVisualStyleBackColor = true;
             // 
@@ -319,8 +325,8 @@
             // 
             // tabPage5
             // 
-            this.tabPage5.Controls.Add(this.txtUserblock);
             resources.ApplyResources(this.tabPage5, "tabPage5");
+            this.tabPage5.Controls.Add(this.txtUserblock);
             this.tabPage5.Name = "tabPage5";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
@@ -331,13 +337,14 @@
             // 
             // panel3
             // 
+            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Controls.Add(this.btnSetDefRountingRule);
-            this.panel3.Controls.Add(this.cmbdomainStrategy);
             this.panel3.Controls.Add(this.labRoutingTips);
+            this.panel3.Controls.Add(this.label4);
+            this.panel3.Controls.Add(this.cmbdomainStrategy);
             this.panel3.Controls.Add(this.label15);
             this.panel3.Controls.Add(this.label12);
             this.panel3.Controls.Add(this.cmbroutingMode);
-            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Name = "panel3";
             // 
             // btnSetDefRountingRule
@@ -347,23 +354,29 @@
             this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
             this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
             // 
+            // labRoutingTips
+            // 
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.Brown;
+            this.label4.Name = "label4";
+            // 
             // cmbdomainStrategy
             // 
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbdomainStrategy.FormattingEnabled = true;
             this.cmbdomainStrategy.Items.AddRange(new object[] {
             resources.GetString("cmbdomainStrategy.Items"),
             resources.GetString("cmbdomainStrategy.Items1"),
             resources.GetString("cmbdomainStrategy.Items2")});
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.Name = "cmbdomainStrategy";
             // 
-            // labRoutingTips
-            // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.Name = "labRoutingTips";
-            // 
             // label15
             // 
             resources.ApplyResources(this.label15, "label15");
@@ -376,6 +389,7 @@
             // 
             // cmbroutingMode
             // 
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbroutingMode.FormattingEnabled = true;
             this.cmbroutingMode.Items.AddRange(new object[] {
@@ -383,11 +397,11 @@
             resources.GetString("cmbroutingMode.Items1"),
             resources.GetString("cmbroutingMode.Items2"),
             resources.GetString("cmbroutingMode.Items3")});
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.Name = "cmbroutingMode";
             // 
             // tabPage6
             // 
+            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Controls.Add(this.chkKcpcongestion);
             this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
             this.tabPage6.Controls.Add(this.label10);
@@ -401,7 +415,6 @@
             this.tabPage6.Controls.Add(this.label7);
             this.tabPage6.Controls.Add(this.txtKcpmtu);
             this.tabPage6.Controls.Add(this.label6);
-            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Name = "tabPage6";
             this.tabPage6.UseVisualStyleBackColor = true;
             // 
@@ -473,14 +486,47 @@
             // 
             // tabPage7
             // 
+            resources.ApplyResources(this.tabPage7, "tabPage7");
+            this.tabPage7.Controls.Add(this.cbFreshrate);
+            this.tabPage7.Controls.Add(this.tbCacheDays);
+            this.tabPage7.Controls.Add(this.lbFreshrate);
+            this.tabPage7.Controls.Add(this.lbCacheDays);
+            this.tabPage7.Controls.Add(this.chkEnableStatistics);
             this.tabPage7.Controls.Add(this.chkAllowLANConn);
             this.tabPage7.Controls.Add(this.txturlGFWList);
             this.tabPage7.Controls.Add(this.label13);
             this.tabPage7.Controls.Add(this.chkAutoRun);
-            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
+            // cbFreshrate
+            // 
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
+            this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbFreshrate.FormattingEnabled = true;
+            this.cbFreshrate.Name = "cbFreshrate";
+            // 
+            // tbCacheDays
+            // 
+            resources.ApplyResources(this.tbCacheDays, "tbCacheDays");
+            this.tbCacheDays.Name = "tbCacheDays";
+            // 
+            // lbFreshrate
+            // 
+            resources.ApplyResources(this.lbFreshrate, "lbFreshrate");
+            this.lbFreshrate.Name = "lbFreshrate";
+            // 
+            // lbCacheDays
+            // 
+            resources.ApplyResources(this.lbCacheDays, "lbCacheDays");
+            this.lbCacheDays.Name = "lbCacheDays";
+            // 
+            // chkEnableStatistics
+            // 
+            resources.ApplyResources(this.chkEnableStatistics, "chkEnableStatistics");
+            this.chkEnableStatistics.Name = "chkEnableStatistics";
+            this.chkEnableStatistics.UseVisualStyleBackColor = true;
+            // 
             // chkAllowLANConn
             // 
             resources.ApplyResources(this.chkAllowLANConn, "chkAllowLANConn");
@@ -505,9 +551,9 @@
             // 
             // panel2
             // 
+            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
             // btnOK
@@ -619,5 +665,11 @@
         private System.Windows.Forms.CheckBox chksniffingEnabled;
         private System.Windows.Forms.CheckBox chksniffingEnabled2;
         private System.Windows.Forms.Button btnSetDefRountingRule;
+        private System.Windows.Forms.CheckBox chkEnableStatistics;
+        private System.Windows.Forms.TextBox tbCacheDays;
+        private System.Windows.Forms.Label lbCacheDays;
+        private System.Windows.Forms.ComboBox cbFreshrate;
+        private System.Windows.Forms.Label lbFreshrate;
+        private System.Windows.Forms.Label label4;
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Text;
 using System.Windows.Forms;
 using v2rayN.Handler;
+using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -44,6 +43,10 @@ namespace v2rayN.Forms
                 cmbprotocol.Text = config.inbound[0].protocol.ToString();
                 chkudpEnabled.Checked = config.inbound[0].udpEnabled;
                 chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;
+
+                txtlocalPort2.Text = "socks + 1";
+                cmbprotocol2.Text = Global.InboundHttp;
+
                 if (config.inbound.Count > 1)
                 {
                     txtlocalPort2.Text = config.inbound[1].localPort.ToString();
@@ -106,6 +109,37 @@ namespace v2rayN.Forms
 
             chkAllowLANConn.Checked = config.allowLANConn;
 
+
+            var enableStatistics = config.enableStatistics;
+            chkEnableStatistics.Checked = enableStatistics;
+
+            tbCacheDays.Text = config.CacheDays.ToString();
+
+
+            var cbSource = new ComboItem[]
+            {
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = UIRes.I18N("QuickFresh")},
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = UIRes.I18N("MediumFresh")},
+                new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = UIRes.I18N("SlowFresh")},
+            };
+            cbFreshrate.DataSource = cbSource;
+
+            cbFreshrate.DisplayMember = "Text";
+            cbFreshrate.ValueMember = "ID";
+
+            switch(config.statisticsFreshRate)
+            {
+                case (int)Global.StatisticsFreshRate.quick:
+                    cbFreshrate.SelectedItem = cbSource[0];
+                    break;
+                case (int)Global.StatisticsFreshRate.medium:
+                    cbFreshrate.SelectedItem = cbSource[1];
+                    break;
+                case (int)Global.StatisticsFreshRate.slow:
+                    cbFreshrate.SelectedItem = cbSource[2];
+                    break;
+            }
+
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -148,14 +182,14 @@ namespace v2rayN.Forms
         {
             //日志
             bool logEnabled = chklogEnabled.Checked;
-            string loglevel = cmbloglevel.Text.Trim();
+            string loglevel = cmbloglevel.Text.TrimEx();
 
             //Mux
             bool muxEnabled = chkmuxEnabled.Checked;
 
             //本地监听
-            string localPort = txtlocalPort.Text.Trim();
-            string protocol = cmbprotocol.Text.Trim();
+            string localPort = txtlocalPort.Text.TrimEx();
+            string protocol = cmbprotocol.Text.TrimEx();
             bool udpEnabled = chkudpEnabled.Checked;
             bool sniffingEnabled = chksniffingEnabled.Checked;
             if (Utils.IsNullOrEmpty(localPort) || !Utils.IsNumberic(localPort))
@@ -174,8 +208,8 @@ namespace v2rayN.Forms
             config.inbound[0].sniffingEnabled = sniffingEnabled;
 
             //本地监听2
-            string localPort2 = txtlocalPort2.Text.Trim();
-            string protocol2 = cmbprotocol2.Text.Trim();
+            string localPort2 = txtlocalPort2.Text.TrimEx();
+            string protocol2 = cmbprotocol2.Text.TrimEx();
             bool udpEnabled2 = chkudpEnabled2.Checked;
             bool sniffingEnabled2 = chksniffingEnabled2.Checked;
             if (chkAllowIn2.Checked)
@@ -215,7 +249,7 @@ namespace v2rayN.Forms
             config.muxEnabled = muxEnabled;
 
             //remoteDNS
-            config.remoteDNS = txtremoteDNS.Text.Trim();
+            config.remoteDNS = txtremoteDNS.Text.TrimEx();
 
             return 0;
         }
@@ -230,9 +264,9 @@ namespace v2rayN.Forms
             string domainStrategy = cmbdomainStrategy.Text;
             string routingMode = cmbroutingMode.SelectedIndex.ToString();
 
-            string useragent = txtUseragent.Text.Trim();
-            string userdirect = txtUserdirect.Text.Trim();
-            string userblock = txtUserblock.Text.Trim();
+            string useragent = txtUseragent.Text.TrimEx();
+            string userdirect = txtUserdirect.Text.TrimEx();
+            string userblock = txtUserblock.Text.TrimEx();
 
             config.domainStrategy = domainStrategy;
             config.routingMode = routingMode;
@@ -250,12 +284,12 @@ namespace v2rayN.Forms
         /// <returns></returns>
         private int SaveKCP()
         {
-            string mtu = txtKcpmtu.Text.Trim();
-            string tti = txtKcptti.Text.Trim();
-            string uplinkCapacity = txtKcpuplinkCapacity.Text.Trim();
-            string downlinkCapacity = txtKcpdownlinkCapacity.Text.Trim();
-            string readBufferSize = txtKcpreadBufferSize.Text.Trim();
-            string writeBufferSize = txtKcpwriteBufferSize.Text.Trim();
+            string mtu = txtKcpmtu.Text.TrimEx();
+            string tti = txtKcptti.Text.TrimEx();
+            string uplinkCapacity = txtKcpuplinkCapacity.Text.TrimEx();
+            string downlinkCapacity = txtKcpdownlinkCapacity.Text.TrimEx();
+            string readBufferSize = txtKcpreadBufferSize.Text.TrimEx();
+            string writeBufferSize = txtKcpwriteBufferSize.Text.TrimEx();
             bool congestion = chkKcpcongestion.Checked;
 
             if (Utils.IsNullOrEmpty(mtu) || !Utils.IsNumberic(mtu)
@@ -289,10 +323,30 @@ namespace v2rayN.Forms
             Utils.SetAutoRun(chkAutoRun.Checked);
 
             //自定义GFWList
-            config.urlGFWList = txturlGFWList.Text.Trim();
+            config.urlGFWList = txturlGFWList.Text.TrimEx();
 
             config.allowLANConn = chkAllowLANConn.Checked;
 
+            var lastEnableStatistics = config.enableStatistics;
+            config.enableStatistics = chkEnableStatistics.Checked;
+
+            uint days = 0;
+            var valid = uint.TryParse(tbCacheDays.Text, out days);
+            if (!valid)
+                days = 7;
+            config.CacheDays = days;
+
+            config.statisticsFreshRate = (int)cbFreshrate.SelectedValue;
+
+            //if(lastEnableStatistics != config.enableStatistics)
+            //{
+            //    /// https://stackoverflow.com/questions/779405/how-do-i-restart-my-c-sharp-winform-application
+            //    // Shut down the current app instance.
+            //    Application.Exit();
+
+            //    // Restart the app passing "/restart [processId]" as cmd line args
+            //    Process.Start(Application.ExecutablePath, "/restart " + Process.GetCurrentProcess().Id);
+            //}
             return 0;
         }
 
@@ -328,8 +382,8 @@ namespace v2rayN.Forms
             for (int k = 0; k < lstUrl.Count; k++)
             {
                 var txt = lstTxt[k];
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle = new DownloadHandle();
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -345,12 +399,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                v2rayUpdateHandle3.WebDownloadString(lstUrl[k]);
+                downloadHandle.WebDownloadString(lstUrl[k]);
             }
         }
         void AppendText(bool notify, string text)
@@ -358,4 +412,10 @@ namespace v2rayN.Forms
             labRoutingTips.Text = text;
         }
     }
+
+    class ComboItem
+    {
+        public int ID { get; set; }
+        public string Text { get; set; }
+    }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx

@@ -196,9 +196,21 @@
   <data name="tabPage3.Text" xml:space="preserve">
     <value>  代理的Domain或IP  </value>
   </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
   <data name="tabPage4.Text" xml:space="preserve">
     <value>  直连的Domain或IP  </value>
   </data>
+  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
   <data name="tabPage5.Text" xml:space="preserve">
     <value>  阻止的Domain或IP  </value>
   </data>
@@ -207,7 +219,7 @@
     <value>NoControl</value>
   </data>
   <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>381, 43</value>
+    <value>7, 60</value>
   </data>
   <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
     <value>201, 23</value>
@@ -215,25 +227,37 @@
   <data name="btnSetDefRountingRule.Text" xml:space="preserve">
     <value>一键设置默认自定义路由规则</value>
   </data>
-  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
-  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 96</value>
+  </data>
   <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
     <value>383, 12</value>
   </data>
   <data name="labRoutingTips.Text" xml:space="preserve">
     <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
   </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>规则加载次序:自定义的代理/直连/阻止,选择的路由模式</value>
+  </data>
+  <data name="cmbdomainStrategy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>81, 30</value>
+  </data>
+  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 20</value>
+  </data>
   <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>
   </data>
   <data name="label15.Text" xml:space="preserve">
     <value>域名策略</value>
   </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>295, 34</value>
+  </data>
   <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>
   </data>
@@ -252,8 +276,11 @@
   <data name="cmbroutingMode.Items3" xml:space="preserve">
     <value>绕过局域网及大陆地址</value>
   </data>
+  <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 30</value>
+  </data>
   <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+    <value>244, 20</value>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
     <value>  Core:路由设置  </value>
@@ -261,6 +288,24 @@
   <data name="tabPage6.Text" xml:space="preserve">
     <value>  Core:KCP设置  </value>
   </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率</value>
+  </data>
+  <data name="lbCacheDays.Size" type="System.Drawing.Size, System.Drawing">
+    <value>305, 12</value>
+  </data>
+  <data name="lbCacheDays.Text" xml:space="preserve">
+    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>384, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
+  </data>
   <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
     <value>144, 16</value>
   </data>

v2rayN/v2rayN/Forms/QRCodeControl.cs

@@ -26,7 +26,7 @@ namespace v2rayN.Forms
             if (Index >= 0)
             {
                 string url = ConfigHandler.GetVmessQRCode(config, Index);
-                if (string.IsNullOrEmpty(url))
+                if (Utils.IsNullOrEmpty(url))
                 {
                     picQRCode.Image = null;
                     txtUrl.Text = string.Empty;

v2rayN/v2rayN/Forms/SubSettingControl.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Forms
@@ -35,8 +36,8 @@ namespace v2rayN.Forms
         {
             if (subItem != null)
             {
-                subItem.remarks = txtRemarks.Text.Trim();
-                subItem.url = txtUrl.Text.Trim();
+                subItem.remarks = txtRemarks.Text.TrimEx();
+                subItem.url = txtUrl.Text.TrimEx();
                 subItem.enabled = chkEnabled.Checked;
             }
         }

v2rayN/v2rayN/Global.cs

@@ -18,6 +18,7 @@ namespace v2rayN
         /// SpeedTestUrl
         /// </summary>
         public const string SpeedTestUrl = @"http://speedtest-sfo2.digitalocean.com/10mb.test";
+        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
 
         /// <summary>
         /// CustomRoutingListUrl
@@ -95,6 +96,18 @@ namespace v2rayN
         /// 阻止 tag值
         /// </summary>
         public const string blockTag = "block";
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public const string StreamSecurity = "tls";
+
+        public const string InboundSocks = "socks";
+        public const string InboundHttp = "http";
+        public const string Loopback = "127.0.0.1";
+        public const string InboundAPITagName = "api";
+        public const string InboundAPIProtocal = "dokodemo-door";
+
 
         /// <summary>
         /// vmess
@@ -108,6 +121,14 @@ namespace v2rayN
         /// socks
         /// </summary>
         public const string socksProtocol = "socks://";
+        /// <summary>
+        /// http
+        /// </summary>
+        public const string httpProtocol = "http://";
+        /// <summary>
+        /// https
+        /// </summary>
+        public const string httpsProtocol = "https://";
 
         /// <summary>
         /// pac
@@ -133,6 +154,15 @@ namespace v2rayN
         /// </summary>
         public const string CustomIconName = "v2rayN.ico";
 
+        public enum StatisticsFreshRate
+        {
+            quick = 1000,
+            medium = 2000,
+            slow = 3000
+        }
+        public const string StatisticLogDirectory = "Statistics";
+        public const string StatisticLogOverall = "overall.txt";
+
         #endregion
 
         #region 全局变量
@@ -148,20 +178,25 @@ namespace v2rayN
         public static bool sysAgent { get; set; }
 
         /// <summary>
-        /// socks端口号
+        /// socks端口
         /// </summary>
         public static int socksPort { get; set; }
 
         /// <summary>
-        /// 全局代理端口(http)
+        /// http端口
         /// </summary>
-        public static int sysAgentPort { get; set; }
+        public static int httpPort { get; set; }
 
         /// <summary>
-        /// PAC监听端口号
+        /// PAC端口
         /// </summary>
         public static int pacPort { get; set; }
 
+        /// <summary>
+        ///  
+        /// </summary>
+        public static int statePort { get; set; }
+
         #endregion
 
 

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using v2rayN.Mode;
+using v2rayN.Base;
 
 namespace v2rayN.Handler
 {
@@ -40,6 +41,15 @@ namespace v2rayN.Handler
 
                 ////默认监听端口
                 //config.pacPort = 8888;
+
+                // 默认缓存七天
+                config.CacheDays = 7;
+
+                // 默认不开启统计
+                config.enableStatistics = false;
+
+                // 默认中等刷新率
+                config.statisticsFreshRate = (int)Global.StatisticsFreshRate.medium;
             }
 
             //本地监听
@@ -47,7 +57,7 @@ namespace v2rayN.Handler
             {
                 config.inbound = new List<InItem>();
                 InItem inItem = new InItem();
-                inItem.protocol = "socks";
+                inItem.protocol = Global.InboundSocks;
                 inItem.localPort = 10808;
                 inItem.udpEnabled = true;
                 inItem.sniffingEnabled = true;
@@ -66,7 +76,7 @@ namespace v2rayN.Handler
                 //http协议不由core提供,只保留socks
                 if (config.inbound.Count > 0)
                 {
-                    config.inbound[0].protocol = "socks";
+                    config.inbound[0].protocol = Global.InboundSocks;
                 }
             }
             //路由规则
@@ -112,6 +122,11 @@ namespace v2rayN.Handler
             //    config.pacPort = 8888;
             //}
 
+            if (config.subItem == null)
+            {
+                config.subItem = new List<SubItem>();
+            }
+
             if (config == null
                 || config.index < 0
                 || config.vmess.Count <= 0
@@ -146,6 +161,16 @@ namespace v2rayN.Handler
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Vmess;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+            vmessItem.id = vmessItem.id.TrimEx();
+            vmessItem.security = vmessItem.security.TrimEx();
+            vmessItem.network = vmessItem.network.TrimEx();
+            vmessItem.headerType = vmessItem.headerType.TrimEx();
+            vmessItem.requestHost = vmessItem.requestHost.TrimEx();
+            vmessItem.path = vmessItem.path.TrimEx();
+            vmessItem.streamSecurity = vmessItem.streamSecurity.TrimEx();
+
             if (index >= 0)
             {
                 //修改
@@ -313,7 +338,7 @@ namespace v2rayN.Handler
                 {
                     VmessQRCode vmessQRCode = new VmessQRCode();
                     vmessQRCode.v = vmessItem.configVersion.ToString();
-                    vmessQRCode.ps = vmessItem.remarks.Trim(); //备注也许很长 ;
+                    vmessQRCode.ps = vmessItem.remarks.TrimEx(); //备注也许很长 ;
                     vmessQRCode.add = vmessItem.address;
                     vmessQRCode.port = vmessItem.port.ToString();
                     vmessQRCode.id = vmessItem.id;
@@ -351,7 +376,9 @@ namespace v2rayN.Handler
                     {
                         remark = "#" + WebUtility.UrlEncode(vmessItem.remarks);
                     }
-                    url = string.Format("{0}:{1}",
+                    url = string.Format("{0}:{1}@{2}:{3}",
+                        vmessItem.security,
+                        vmessItem.id,
                         vmessItem.address,
                         vmessItem.port);
                     url = Utils.Base64Encode(url);
@@ -548,6 +575,11 @@ namespace v2rayN.Handler
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Shadowsocks;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+            vmessItem.id = vmessItem.id.TrimEx();
+            vmessItem.security = vmessItem.security.TrimEx();
+           
             if (index >= 0)
             {
                 //修改
@@ -584,6 +616,9 @@ namespace v2rayN.Handler
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Socks;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+
             if (index >= 0)
             {
                 //修改
@@ -698,6 +733,15 @@ namespace v2rayN.Handler
             foreach (string str in arrData)
             {
                 string msg;
+                //maybe sub
+                if (str.StartsWith(Global.httpsProtocol) || str.StartsWith(Global.httpProtocol))
+                {
+                    if (AddSubItem(ref config, str) == 0)
+                    {
+                        countServers++;
+                    }
+                    continue;
+                }
                 VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(str, out msg);
                 if (vmessItem == null)
                 {
@@ -733,6 +777,32 @@ namespace v2rayN.Handler
             return -1;
         }
 
+        /// <summary>
+        /// add sub
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public static int AddSubItem(ref Config config, string url)
+        {
+            //already exists
+            foreach (var sub in config.subItem)
+            {
+                if (url == sub.url)
+                {
+                    return 0;
+                }
+            }
+
+            var subItem = new SubItem();
+            subItem.id = string.Empty;
+            subItem.remarks = "import sub";
+            subItem.url = url;
+            config.subItem.Add(subItem);
+
+            return SaveSubItem(ref config);
+        }
+
         /// <summary>
         /// save sub
         /// </summary>

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -1,19 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.HttpProxyHandler;
 
 namespace v2rayN.Handler
 {
     /// <summary>
-    ///Update V2ray Core 
+    ///Download
     /// </summary>
-    class V2rayUpdateHandle
+    class DownloadHandle
     {
         public event EventHandler<ResultEventArgs> AbsoluteCompleted;
 
@@ -23,7 +19,10 @@ namespace v2rayN.Handler
 
         public string DownloadFileName
         {
-            get { return "v2ray-windows.zip"; }
+            get
+            {
+                return "v2ray-windows.zip";
+            }
         }
 
         public class ResultEventArgs : EventArgs
@@ -45,15 +44,16 @@ namespace v2rayN.Handler
         private long totalBytesToReceive = 0;
         private DateTime totalDatetime = new DateTime();
 
+
         public void AbsoluteV2rayCore(Config config)
         {
             ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
             ServicePointManager.DefaultConnectionLimit = 256;
             WebRequest request = WebRequest.Create(latestUrl);
-            request.BeginGetResponse(new AsyncCallback(OnResponse), request);
+            request.BeginGetResponse(new AsyncCallback(OnResponseV2rayCore), request);
         }
 
-        private void OnResponse(IAsyncResult ar)
+        private void OnResponseV2rayCore(IAsyncResult ar)
         {
             try
             {
@@ -87,7 +87,7 @@ namespace v2rayN.Handler
         }
 
 
-        public void DownloadFileAsync(Config config, string url)
+        public void DownloadFileAsync(Config config, string url, WebProxy webProxy)
         {
             try
             {
@@ -95,12 +95,17 @@ namespace v2rayN.Handler
                 ServicePointManager.DefaultConnectionLimit = 256;
                 if (UpdateCompleted != null)
                 {
-                    UpdateCompleted(this, new ResultEventArgs(false, url));
+                    UpdateCompleted(this, new ResultEventArgs(false, "Downloading..."));
                 }
 
                 progressPercentage = -1;
 
                 WebClientEx ws = new WebClientEx();
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;// new WebProxy(Global.Loopback, Global.httpPort);
+                }
+
                 ws.DownloadFileCompleted += ws_DownloadFileCompleted;
                 ws.DownloadProgressChanged += ws_DownloadProgressChanged;
                 ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
@@ -128,7 +133,7 @@ namespace v2rayN.Handler
                 if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
                 {
                     progressPercentage = e.ProgressPercentage;
-                    string msg = string.Format("......{0}%", e.ProgressPercentage);
+                    string msg = string.Format("...{0}%", e.ProgressPercentage);
                     UpdateCompleted(this, new ResultEventArgs(false, msg));
                 }
             }
@@ -210,5 +215,7 @@ namespace v2rayN.Handler
                     Error(this, new ErrorEventArgs(ex));
             }
         }
+
+
     }
 }

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -0,0 +1,310 @@
+using Grpc.Core;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    class SpeedtestHandler
+    {
+        private DownloadHandle downloadHandle2;
+        private Config _config;
+        private V2rayHandler _v2rayHandler;
+        private List<int> _selecteds;
+        private Thread _workThread;
+        Action<int, string> _updateFunc;
+
+        private int testCounter = 0;
+        private int ItemIndex
+        {
+            get
+            {
+                return _selecteds[testCounter - 1];
+            }
+        }
+
+        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<int> selecteds, string actionType, Action<int, string> update)
+        {
+            _config = config;
+            _v2rayHandler = v2rayHandler;
+            _selecteds = selecteds;
+            _updateFunc = update;
+
+            if (actionType == "ping")
+            {
+                _workThread = new Thread(new ThreadStart(RunPing));
+                _workThread.IsBackground = true;
+                _workThread.Start();
+            }
+            if (actionType == "tcping")
+            {
+                _workThread = new Thread(new ThreadStart(RunTcping));
+                _workThread.IsBackground = true;
+                _workThread.Start();
+            }
+            else if (actionType == "realping")
+            {
+                _workThread = new Thread(new ThreadStart(RunRealPing));
+                _workThread.IsBackground = true;
+                _workThread.Start();
+            }
+            else if (actionType == "speedtest")
+            {
+                RunSpeedTest();
+            }
+        }
+
+        public void Close()
+        {
+            try
+            {
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunPing()
+        {
+            try
+            {
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        long time = Utils.Ping(_config.vmess[index].address);
+                        _updateFunc(index, string.Format("{0}ms", time));
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                }
+
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunTcping()
+        {
+            try
+            {
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        var time = GetTcpingTime(_config.vmess[index].address, _config.vmess[index].port);
+                        _updateFunc(index, string.Format("{0}ms", time));
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                }
+
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunRealPing()
+        {
+            try
+            {
+                string msg = string.Empty;
+
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config, _selecteds);
+
+                var httpPort = _config.GetLocalPort("speedtest");
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+
+                    try
+                    {
+                        var webProxy = new WebProxy(Global.Loopback, httpPort + index);
+                        int responseTime = -1;
+                        var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
+                        if (!Utils.IsNullOrEmpty(status))
+                        {
+                            _updateFunc(index, string.Format("{0}", status));
+                        }
+                        else
+                        {
+                            _updateFunc(index, string.Format("{0}ms", responseTime));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                    Thread.Sleep(100);
+                }
+
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config);
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private void RunSpeedTest()
+        {
+            if (_config.vmess.Count <= 0)
+            {
+                return;
+            }
+
+            Global.reloadV2ray = true;
+            _v2rayHandler.LoadV2ray(_config, _selecteds);
+
+            string url = Global.SpeedTestUrl;
+            testCounter = 0;
+            if (downloadHandle2 == null)
+            {
+                downloadHandle2 = new DownloadHandle();
+                downloadHandle2.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                        if (ServerSpeedTestSub(testCounter, url) != 0)
+                        {
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                    }
+                };
+                downloadHandle2.Error += (sender2, args) =>
+                {
+                    _updateFunc(ItemIndex, args.GetException().Message);
+                    if (ServerSpeedTestSub(testCounter, url) != 0)
+                    {
+                        return;
+                    }
+                };
+            }
+
+            if (ServerSpeedTestSub(testCounter, url) != 0)
+            {
+                return;
+            }
+        }
+
+        private int ServerSpeedTestSub(int index, string url)
+        {
+            if (index >= _selecteds.Count)
+            {
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config);
+                return -1;
+            }
+
+            var httpPort = _config.GetLocalPort("speedtest");
+            index = _selecteds[index];
+            
+            testCounter++;
+            var webProxy = new WebProxy(Global.Loopback, httpPort + index);
+            downloadHandle2.DownloadFileAsync(_config, url, webProxy);
+
+            return 0;
+        }
+
+        private int GetTcpingTime(string url, int port)
+        {
+            var responseTime = -1;
+
+            try
+            {
+                IPHostEntry ipHostInfo = System.Net.Dns.Resolve(url);
+                IPAddress ipAddress = ipHostInfo.AddressList[0];
+
+                var timer = new Stopwatch();
+                timer.Start();
+
+                Socket clientSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                clientSocket.Connect(new IPEndPoint(ipAddress, port));
+                timer.Stop();
+                responseTime = timer.Elapsed.Milliseconds;
+                clientSocket.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return responseTime;
+        }
+
+        private string GetRealPingTime(string url, WebProxy webProxy, out int responseTime)
+        {
+            string msg = string.Empty;
+            responseTime = -1;
+
+            try
+            {
+                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+                myHttpWebRequest.Timeout = 5000;
+                myHttpWebRequest.Proxy = webProxy;//new WebProxy(Global.Loopback, Global.httpPort);
+
+                var timer = new Stopwatch();
+                timer.Start();
+
+                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
+                if (myHttpWebResponse.StatusCode != HttpStatusCode.OK
+                    && myHttpWebResponse.StatusCode != HttpStatusCode.NoContent)
+                {
+                    msg = myHttpWebResponse.StatusDescription;
+                }
+                timer.Stop();
+                responseTime = timer.Elapsed.Milliseconds;
+
+                myHttpWebResponse.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                msg = ex.Message;
+            }
+            return msg;
+
+        }
+
+
+    }
+}

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -0,0 +1,466 @@
+using Grpc.Core;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using v2rayN.Mode;
+using v2rayN.Properties;
+using v2rayN.Protos.Statistics;
+using v2rayN.Tool;
+
+namespace v2rayN.Handler
+{
+    class StatisticsHandler
+    {
+        private Mode.Config config_;
+
+        private Channel channel_;
+        private StatsService.StatsServiceClient client_;
+        private Thread workThread_;
+
+        Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> updateFunc_;
+
+        private bool enabled_;
+        public bool Enable
+        {
+            get
+            {
+                return enabled_;
+            }
+            set
+            {
+                enabled_ = value;
+            }
+        }
+
+        public bool UpdateUI;
+
+        public ulong TotalUp
+        {
+            get; private set;
+        }
+
+        public ulong TotalDown
+        {
+            get; private set;
+        }
+
+        public List<Mode.ServerStatistics> Statistic
+        {
+            get; set;
+        }
+
+        public ulong Up
+        {
+            get; private set;
+        }
+
+        public ulong Down
+        {
+            get; private set;
+        }
+
+        private string logPath_;
+
+        private bool exitFlag_;  // true to close workThread_
+
+        public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> update)
+        {
+            try
+            {
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll);
+                }
+                else
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll);
+                }
+            }
+            catch (IOException ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+            }
+
+            config_ = config;
+            enabled_ = config.enableStatistics;
+            UpdateUI = false;
+            updateFunc_ = update;
+            logPath_ = Utils.GetPath(Global.StatisticLogDirectory);
+            Statistic = new List<Mode.ServerStatistics>();
+            exitFlag_ = false;
+
+            DeleteExpiredLog();
+            foreach (var server in config.vmess)
+            {
+                var statistic = new ServerStatistics(server.remarks, server.address, server.port, server.path, server.requestHost, 0, 0, 0, 0);
+                Statistic.Add(statistic);
+            }
+
+            LoadFromFile();
+
+            GrpcInit();
+
+            workThread_ = new Thread(new ThreadStart(Run));
+            workThread_.IsBackground = true;
+            workThread_.Start();
+        }
+
+        private void GrpcInit()
+        {
+            if (channel_ == null)
+            {
+                Global.statePort = GetFreePort();
+
+                channel_ = new Channel($"{Global.Loopback}:{Global.statePort}", ChannelCredentials.Insecure);
+                channel_.ConnectAsync();
+                client_ = new StatsService.StatsServiceClient(channel_);
+            }
+        }
+
+        public void Close()
+        {
+            try
+            {
+
+                exitFlag_ = true;
+                channel_.ShutdownAsync();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void Run()
+        {
+            while (!exitFlag_)
+            {
+                try
+                {
+                    if (enabled_ && channel_.State == ChannelState.Ready)
+                    {
+                        QueryStatsResponse res = null;
+                        try
+                        {
+                            res = client_.QueryStats(new QueryStatsRequest() { Pattern = "", Reset = true });
+                        }
+                        catch (Exception ex)
+                        {
+                            Utils.SaveLog(ex.Message, ex);
+                        }
+
+                        if (res != null)
+                        {
+                            var addr = config_.address();
+                            var port = config_.port();
+                            var path = config_.path();
+                            var cur = Statistic.FindIndex(item => item.address == addr && item.port == port && item.path == path);
+                            ulong up = 0,
+                                 down = 0;
+
+                            //TODO: parse output
+                            ParseOutput(res.Stat, out up, out down);
+
+                            Up = up;
+                            Down = down;
+
+                            TotalUp += up;
+                            TotalDown += down;
+
+                            if (cur != -1)
+                            {
+                                Statistic[cur].todayUp += up;
+                                Statistic[cur].todayDown += down;
+                                Statistic[cur].totalUp += up;
+                                Statistic[cur].totalDown += down;
+                            }
+
+                            if (UpdateUI)
+                                updateFunc_(TotalUp, TotalDown, Up, Down, Statistic);
+                        }
+                    }
+                    Thread.Sleep(config_.statisticsFreshRate);
+                    channel_.ConnectAsync();
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
+            }
+        }
+
+        public void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ulong up, out ulong down)
+        {
+
+            up = 0; down = 0;
+            try
+            {
+
+                foreach (var stat in source)
+                {
+                    var name = stat.Name;
+                    var value = stat.Value;
+                    var nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+                    var type = "";
+
+                    name = name.Trim();
+
+                    name = nStr[1];
+                    type = nStr[3];
+
+                    if (name == Global.agentTag)
+                    {
+                        if (type == "uplink")
+                        {
+                            up = (ulong)value;
+                        }
+                        else if (type == "downlink")
+                        {
+                            down = (ulong)value;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void SaveToFile()
+        {
+            if (!Directory.Exists(logPath_))
+            {
+                Directory.CreateDirectory(logPath_);
+            }
+
+            // 总流量统计文件
+            var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
+            if (!File.Exists(overallPath))
+            {
+                File.Create(overallPath);
+            }
+            try
+            {
+                using (var overallWriter = new StreamWriter(overallPath))
+                {
+                    double up_amount, down_amount;
+                    string up_unit, down_unit;
+
+                    Utils.ToHumanReadable(TotalUp, out up_amount, out up_unit);
+                    Utils.ToHumanReadable(TotalDown, out down_amount, out down_unit);
+
+                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
+                    overallWriter.WriteLine($"UP {string.Format("{0:f2}", up_amount)}{up_unit} {TotalUp}");
+                    overallWriter.WriteLine($"DOWN {string.Format("{0:f2}", down_amount)}{down_unit} {TotalDown}");
+                    foreach (var s in Statistic)
+                    {
+                        overallWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.totalUp} {s.totalDown}");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+
+            // 当天流量记录文件
+            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+            if (!File.Exists(dailyPath))
+            {
+                File.Create(dailyPath);
+            }
+            try
+            {
+                using (var dailyWriter = new StreamWriter(dailyPath))
+                {
+                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
+                    foreach (var s in Statistic)
+                    {
+                        dailyWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.todayUp} {s.todayDown}");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void LoadFromFile()
+        {
+            if (!Directory.Exists(logPath_)) return;
+
+            // 总流量统计文件
+            ///
+            /// 文件结构
+            /// LastUpdate [date] [time]
+            /// UP [readable string] [amount]
+            /// DOWN [readable string] [amount]
+            /// 每行每个数据空格分隔
+
+            try
+            {
+                Utils.SaveLog(logPath_ + Global.StatisticLogOverall);
+                var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
+                if (File.Exists(overallPath))
+                {
+                    using (var overallReader = new StreamReader(overallPath))
+                    {
+                        while (!overallReader.EndOfStream)
+                        {
+                            var line = overallReader.ReadLine();
+                            if (line.StartsWith("LastUpdate"))
+                            {
+
+                            }
+                            else if (line.StartsWith("UP"))
+                            {
+                                var datas = line.Split(' ');
+                                if (datas.Length < 3) return;
+                                TotalUp = ulong.Parse(datas[2]);
+                            }
+                            else if (line.StartsWith("DOWN"))
+                            {
+                                var datas = line.Split(' ');
+                                if (datas.Length < 3) return;
+                                TotalDown = ulong.Parse(datas[2]);
+                            }
+                            else if (line.StartsWith("*"))
+                            {
+                                var datas = line.Split(' ');
+                                if (datas.Length < 8) return;
+                                var name = datas[1];
+                                var address = datas[2];
+                                var port = int.Parse(datas[3]);
+                                var path = datas[4];
+                                var host = datas[5];
+                                var totalUp = ulong.Parse(datas[6]);
+                                var totalDown = ulong.Parse(datas[7]);
+
+                                var temp = new ServerStatistics(name, address, port, path, host, 0, 0, 0, 0);
+                                var index = Statistic.FindIndex(item => Utils.IsIdenticalServer(item, temp));
+                                if (index != -1)
+                                {
+                                    Statistic[index].totalUp = totalUp;
+                                    Statistic[index].totalDown = totalDown;
+                                }
+                                else
+                                {
+                                    var s = new Mode.ServerStatistics(name, address, port, path, host, totalUp, totalDown, 0, 0);
+                                    Statistic.Add(s);
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+
+            try
+            {
+                Utils.SaveLog(logPath_ + $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+                var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+                if (File.Exists(dailyPath))
+                {
+
+                    using (var dailyReader = new StreamReader(dailyPath))
+                    {
+                        while (!dailyReader.EndOfStream)
+                        {
+                            var line = dailyReader.ReadLine();
+                            if (line.StartsWith("LastUpdate"))
+                            {
+
+                            }
+                            else if (line.StartsWith("*"))
+                            {
+                                var datas = line.Split(' ');
+                                if (datas.Length < 8) return;
+                                var name = datas[1];
+                                var address = datas[2];
+                                var port = int.Parse(datas[3]);
+                                var path = datas[4];
+                                var host = datas[5];
+                                var todayUp = ulong.Parse(datas[6]);
+                                var todayDown = ulong.Parse(datas[7]);
+
+                                var temp = new ServerStatistics(name, address, port, path, host, 0, 0, 0, 0);
+                                var index = Statistic.FindIndex(item => Utils.IsIdenticalServer(item, temp));
+                                if (index != -1)
+                                {
+                                    Statistic[index].todayUp = todayUp;
+                                    Statistic[index].todayDown = todayDown;
+                                }
+                                else
+                                {
+                                    var s = new Mode.ServerStatistics(name, address, port, path, host, 0, 0, todayUp, todayDown);
+                                    Statistic.Add(s);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+
+        private void DeleteExpiredLog()
+        {
+            try
+            {
+                if (!Directory.Exists(logPath_)) return;
+                var dirInfo = new DirectoryInfo(logPath_);
+                var files = dirInfo.GetFiles();
+                foreach (var file in files)
+                {
+                    if (file.Name == "overall.txt") continue;
+                    var name = file.Name.Split('.')[0];
+                    var ft = DateTime.Parse(name);
+                    var ct = DateTime.Now;
+                    var dur = ct - ft;
+                    if (dur.Days > config_.CacheDays)
+                    {
+                        file.Delete();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private int GetFreePort()
+        {
+            int defaultPort = 28123;
+            try
+            {
+                // TCP stack please do me a favor
+                TcpListener l = new TcpListener(IPAddress.Loopback, 0);
+                l.Start();
+                var port = ((IPEndPoint)l.LocalEndpoint).Port;
+                l.Stop();
+                return port;
+            }
+            catch (Exception ex)
+            {
+                // in case access denied
+                Utils.SaveLog(ex.Message, ex);
+                return defaultPort;
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using v2rayN.Mode;
+using System.Linq;
 using System.Net;
-using System.Text;
+using v2rayN.Base;
+using v2rayN.Mode;
 
 namespace v2rayN.Handler
 {
@@ -78,6 +79,9 @@ namespace v2rayN.Handler
                 //dns
                 dns(config, ref v2rayConfig);
 
+                // TODO: 统计配置
+                statistic(config, ref v2rayConfig);
+
                 Utils.ToJsonFile(v2rayConfig, fileName);
 
                 msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
@@ -155,7 +159,7 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    inbound.listen = "127.0.0.1";
+                    inbound.listen = Global.Loopback;
                 }
                 //开启udp
                 inbound.settings.udp = config.inbound[0].udpEnabled;
@@ -235,7 +239,7 @@ namespace v2rayN.Handler
 
                     for (int k = 0; k < userRule.Count; k++)
                     {
-                        string url = userRule[k].Trim();
+                        string url = userRule[k].TrimEx();
                         if (Utils.IsNullOrEmpty(url))
                         {
                             continue;
@@ -400,6 +404,17 @@ namespace v2rayN.Handler
                     serversItem.address = config.address();
                     serversItem.port = config.port();
 
+                    if (!Utils.IsNullOrEmpty(config.security())
+                        && !Utils.IsNullOrEmpty(config.id()))
+                    {
+                        var socksUsersItem = new SocksUsersItem();
+                        socksUsersItem.user = config.security();
+                        socksUsersItem.pass = config.id();
+                        socksUsersItem.level = 1;
+
+                        serversItem.users = new List<SocksUsersItem>() { socksUsersItem };
+                    }
+
                     outbound.mux.enabled = false;
 
                     outbound.protocol = "socks";
@@ -425,7 +440,21 @@ namespace v2rayN.Handler
             {
                 //远程服务器底层传输配置
                 streamSettings.network = config.network();
-                streamSettings.security = config.streamSecurity();
+                var host = config.requestHost();
+
+                //if tls
+                if (config.streamSecurity() == Global.StreamSecurity)
+                {
+                    streamSettings.security = config.streamSecurity();
+
+                    TlsSettings tlsSettings = new TlsSettings();
+                    tlsSettings.allowInsecure = config.allowInsecure();
+                    if (!string.IsNullOrWhiteSpace(host))
+                    {
+                        tlsSettings.serverName = host;
+                    }
+                    streamSettings.tlsSettings = tlsSettings;
+                }
 
                 //streamSettings
                 switch (config.network())
@@ -463,12 +492,11 @@ namespace v2rayN.Handler
                         WsSettings wsSettings = new WsSettings();
                         wsSettings.connectionReuse = true;
 
-                        string host2 = config.requestHost();
                         string path = config.path();
-                        if (!string.IsNullOrWhiteSpace(host2))
+                        if (!string.IsNullOrWhiteSpace(host))
                         {
                             wsSettings.headers = new Headers();
-                            wsSettings.headers.Host = host2;
+                            wsSettings.headers.Host = host;
                         }
                         if (!string.IsNullOrWhiteSpace(path))
                         {
@@ -476,35 +504,34 @@ namespace v2rayN.Handler
                         }
                         streamSettings.wsSettings = wsSettings;
 
-                        TlsSettings tlsSettings = new TlsSettings();
-                        tlsSettings.allowInsecure = config.allowInsecure();
-                        if (!string.IsNullOrWhiteSpace(host2))
-                        {
-                            tlsSettings.serverName = host2;
-                        }
-                        streamSettings.tlsSettings = tlsSettings;
+                        //TlsSettings tlsSettings = new TlsSettings();
+                        //tlsSettings.allowInsecure = config.allowInsecure();
+                        //if (!string.IsNullOrWhiteSpace(host))
+                        //{
+                        //    tlsSettings.serverName = host;
+                        //}
+                        //streamSettings.tlsSettings = tlsSettings;
                         break;
                     //h2
                     case "h2":
                         HttpSettings httpSettings = new HttpSettings();
 
-                        string host3 = config.requestHost();
-                        if (!string.IsNullOrWhiteSpace(host3))
+                        if (!string.IsNullOrWhiteSpace(host))
                         {
-                            httpSettings.host = Utils.String2List(host3);
+                            httpSettings.host = Utils.String2List(host);
                         }
                         httpSettings.path = config.path();
 
                         streamSettings.httpSettings = httpSettings;
 
-                        TlsSettings tlsSettings2 = new TlsSettings();
-                        tlsSettings2.allowInsecure = config.allowInsecure();
-                        streamSettings.tlsSettings = tlsSettings2;
+                        //TlsSettings tlsSettings2 = new TlsSettings();
+                        //tlsSettings2.allowInsecure = config.allowInsecure();
+                        //streamSettings.tlsSettings = tlsSettings2;
                         break;
                     //quic
                     case "quic":
                         QuicSettings quicsettings = new QuicSettings();
-                        quicsettings.security = config.requestHost();
+                        quicsettings.security = host;
                         quicsettings.key = config.path();
                         quicsettings.header = new Header();
                         quicsettings.header.type = config.headerType();
@@ -524,9 +551,9 @@ namespace v2rayN.Handler
                             {
                                 //request填入自定义Host
                                 string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
-                                string[] arrHost = config.requestHost().Split(',');
-                                string host = string.Join("\",\"", arrHost);
-                                request = request.Replace("$requestHost$", string.Format("\"{0}\"", host));
+                                string[] arrHost = host.Split(',');
+                                string host2 = string.Join("\",\"", arrHost);
+                                request = request.Replace("$requestHost$", string.Format("\"{0}\"", host2));
                                 //request = request.Replace("$requestHost$", string.Format("\"{0}\"", config.requestHost()));
 
                                 //填入自定义Path
@@ -590,6 +617,53 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        public static int statistic(Config config, ref V2rayConfig v2rayConfig)
+        {
+            if (config.enableStatistics)
+            {
+                var tag = Global.InboundAPITagName;
+                var apiObj = new Mode.API();
+                var policyObj = new Mode.Policy();
+                var policySystemSetting = new Mode.SystemPolicy();
+
+                string[] services = { "StatsService" };
+
+                v2rayConfig.stats = new Stats();
+
+                apiObj.tag = tag;
+                apiObj.services = services.ToList();
+                v2rayConfig.api = apiObj;
+
+                policySystemSetting.statsInboundDownlink = true;
+                policySystemSetting.statsInboundUplink = true;
+                policyObj.system = policySystemSetting;
+                v2rayConfig.policy = policyObj;
+
+                if (!v2rayConfig.inbounds.Exists(item => { return item.tag == tag; }))
+                {
+                    var apiInbound = new Mode.Inbounds();
+                    var apiInboundSettings = new Mode.Inboundsettings();
+                    apiInbound.tag = tag;
+                    apiInbound.listen = Global.Loopback;
+                    apiInbound.port = Global.statePort;
+                    apiInbound.protocol = Global.InboundAPIProtocal;
+                    apiInboundSettings.address = Global.Loopback;
+                    apiInbound.settings = apiInboundSettings;
+                    v2rayConfig.inbounds.Add(apiInbound);
+                }
+
+                if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; }))
+                {
+                    var apiRoutingRule = new Mode.RulesItem();
+                    apiRoutingRule.inboundTag = tag;
+                    apiRoutingRule.outboundTag = tag;
+                    apiRoutingRule.type = "field";
+                    v2rayConfig.routing.rules.Add(apiRoutingRule);
+                }
+            }
+            return 0;
+        }
+
         /// <summary>
         /// 生成v2ray的客户端配置文件(自定义配置)
         /// </summary>
@@ -890,6 +964,13 @@ namespace v2rayN.Handler
                     }
                 }
 
+                //tls
+                if (outbound.streamSettings != null
+                    && outbound.streamSettings.security != null
+                    && outbound.streamSettings.security == Global.StreamSecurity)
+                {
+                    vmessItem.streamSecurity = Global.StreamSecurity;
+                }
             }
             catch
             {
@@ -1027,6 +1108,14 @@ namespace v2rayN.Handler
                         vmessItem.requestHost = Utils.List2String(inbound.streamSettings.httpSettings.host);
                     }
                 }
+
+                //tls
+                if (inbound.streamSettings != null
+                    && inbound.streamSettings.security != null
+                    && inbound.streamSettings.security == Global.StreamSecurity)
+                {
+                    vmessItem.streamSecurity = Global.StreamSecurity;
+                }
             }
             catch
             {
@@ -1050,7 +1139,7 @@ namespace v2rayN.Handler
             try
             {
                 //载入配置文件 
-                string result = clipboardData.Trim();// Utils.GetClipboardData();
+                string result = clipboardData.TrimEx();// Utils.GetClipboardData();
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = UIRes.I18N("FailedReadConfiguration");
@@ -1081,17 +1170,26 @@ namespace v2rayN.Handler
                         vmessItem.network = Global.DefaultNetwork;
                         vmessItem.headerType = Global.None;
 
+
                         vmessItem.configVersion = Utils.ToInt(vmessQRCode.v);
-                        vmessItem.remarks = vmessQRCode.ps;
-                        vmessItem.address = vmessQRCode.add;
+                        vmessItem.remarks = Utils.ToString(vmessQRCode.ps);
+                        vmessItem.address = Utils.ToString(vmessQRCode.add);
                         vmessItem.port = Utils.ToInt(vmessQRCode.port);
-                        vmessItem.id = vmessQRCode.id;
+                        vmessItem.id = Utils.ToString(vmessQRCode.id);
                         vmessItem.alterId = Utils.ToInt(vmessQRCode.aid);
-                        vmessItem.network = vmessQRCode.net;
-                        vmessItem.headerType = vmessQRCode.type;
-                        vmessItem.requestHost = vmessQRCode.host;
-                        vmessItem.path = vmessQRCode.path;
-                        vmessItem.streamSecurity = vmessQRCode.tls;
+
+                        if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+                        {
+                            vmessItem.network = vmessQRCode.net;
+                        }
+                        if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+                        {
+                            vmessItem.headerType = vmessQRCode.type;
+                        }
+
+                        vmessItem.requestHost = Utils.ToString(vmessQRCode.host);
+                        vmessItem.path = Utils.ToString(vmessQRCode.path);
+                        vmessItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
                     }
 
                     ConfigHandler.UpgradeServerVersion(ref vmessItem);
@@ -1159,7 +1257,7 @@ namespace v2rayN.Handler
                         result = result.Substring(0, indexRemark);
                     }
                     //part decode
-                    int indexS = result.IndexOf(":");
+                    int indexS = result.IndexOf("@");
                     if (indexS > 0)
                     {
                     }
@@ -1168,15 +1266,22 @@ namespace v2rayN.Handler
                         result = Utils.Base64Decode(result);
                     }
 
-
-                    string[] arr21 = result.Split(':');
-                    int indexPort = result.LastIndexOf(":");
+                    string[] arr1 = result.Split('@');
+                    if (arr1.Length != 2)
+                    {
+                        return null;
+                    }
+                    string[] arr21 = arr1[0].Split(':');
+                    //string[] arr22 = arr1[1].Split(':');
+                    int indexPort = arr1[1].LastIndexOf(":");
                     if (arr21.Length != 2 || indexPort < 0)
                     {
                         return null;
                     }
-                    vmessItem.address = result.Substring(0, indexPort);
-                    vmessItem.port = Utils.ToInt(result.Substring(indexPort + 1, result.Length - (indexPort + 1)));
+                    vmessItem.address = arr1[1].Substring(0, indexPort);
+                    vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
+                    vmessItem.security = arr21[0];
+                    vmessItem.id = arr21[1];
                 }
                 else
                 {
@@ -1260,5 +1365,90 @@ namespace v2rayN.Handler
 
         #endregion
 
+        #region Gen speedtest config
+
+
+        public static int GenerateClientSpeedtestConfig(Config config, List<int> selecteds, string fileName, out string msg)
+        {
+            msg = string.Empty;
+
+            try
+            {
+                if (config == null
+                    || config.index < 0
+                    || config.vmess.Count <= 0
+                    || config.index > config.vmess.Count - 1
+                    )
+                {
+                    msg = UIRes.I18N("CheckServerSettings");
+                    return -1;
+                }
+
+                msg = UIRes.I18N("InitialConfiguration");
+
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    return -1;
+                }
+
+                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    return -1;
+                }
+
+                log(config, ref v2rayConfig, false);
+                //routing(config, ref v2rayConfig);
+                dns(config, ref v2rayConfig);
+
+
+                var httpPort = config.GetLocalPort("speedtest");
+                for (int k = 0; k < selecteds.Count; k++)
+                {
+                    int index = selecteds[k];
+                    if (config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+
+                    config.index = index;
+
+                    var inbound = new Inbounds();
+                    inbound.listen = Global.Loopback;
+                    inbound.port = httpPort + index;
+                    inbound.protocol = Global.InboundHttp;
+                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    v2rayConfig.inbounds.Add(inbound);
+
+
+                    var v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
+                    outbound(config, ref v2rayConfigCopy);
+                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
+                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
+
+                    var rule = new Mode.RulesItem();
+                    rule.inboundTag = inbound.tag;
+                    rule.outboundTag = v2rayConfigCopy.outbounds[0].tag;
+                    rule.type = "field";
+                    v2rayConfig.routing.rules.Add(rule);
+                }
+
+                Utils.ToJsonFile(v2rayConfig, fileName);
+
+                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
+            }
+            catch (Exception ex)
+            {
+                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                return -1;
+            }
+            return 0;
+        }
+
+        #endregion
+
     }
 }

v2rayN/v2rayN/Handler/V2rayHandler.cs

@@ -52,6 +52,27 @@ namespace v2rayN.Handler
             }
         }
 
+        /// <summary>
+        /// 载入V2ray
+        /// </summary>
+        public void LoadV2ray(Config config, List<int> _selecteds)
+        {
+            if (Global.reloadV2ray)
+            {
+                string msg = string.Empty;
+                string fileName = Utils.GetPath(v2rayConfigRes);
+                if (V2rayConfigHandler.GenerateClientSpeedtestConfig(config, _selecteds, fileName, out msg) != 0)
+                {
+                    ShowMsg(false, msg);
+                }
+                else
+                {
+                    ShowMsg(true, msg);
+                    V2rayRestart();
+                }
+            }
+        }
+
         /// <summary>
         /// V2ray重启
         /// </summary>
@@ -118,7 +139,7 @@ namespace v2rayN.Handler
                     }
                 }
                 if (Utils.IsNullOrEmpty(fileName))
-                {       
+                {
                     string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
                     ShowMsg(true, msg);
                     return;

v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs

@@ -10,21 +10,6 @@ namespace v2rayN.HttpProxyHandler
     /// </summary>
     class HttpProxyHandle
     {
-        private static string GetTimestamp(DateTime value)
-        {
-            return value.ToString("yyyyMMddHHmmssfff");
-        }
-
-        public static void ReSetPACProxy(Config config)
-        {
-            if (config.listenerType == 2)
-            {
-                //SysProxyHandle.SetIEProxy(false, false, null, null);
-                //PACServerHandle.Stop();
-            }
-            Update(config, false);
-        }
-
         public static bool Update(Config config, bool forceDisable)
         {
             int type = config.listenerType;
@@ -38,45 +23,40 @@ namespace v2rayN.HttpProxyHandler
             {
                 if (type != 0)
                 {
-                    var port = Global.sysAgentPort;
+                    var port = Global.httpPort;
                     if (port <= 0)
                     {
                         return false;
                     }
                     if (type == 1)
                     {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
-                        SysProxyHandle.SetIEProxy(true, true, "127.0.0.1:" + port, null);
+                        //PACServerHandle.Stop();
+                        SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
                     }
                     else if (type == 2)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                     }
                     else if (type == 3)
                     {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
+                        //PACServerHandle.Stop();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
                     }
                     else if (type == 4)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                     }
                 }
                 else
                 {
                     SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
-                    PACFileWatcherHandle.StopWatch();
+                    //PACServerHandle.Stop();
                 }
             }
             catch (Exception ex)
@@ -94,7 +74,7 @@ namespace v2rayN.HttpProxyHandler
         {
             try
             {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                 if (localPort > 0)
                 {
                     PrivoxyHandler.Instance.Start(localPort, config);
@@ -102,8 +82,8 @@ namespace v2rayN.HttpProxyHandler
                     {
                         Global.sysAgent = true;
                         Global.socksPort = localPort;
-                        Global.sysAgentPort = PrivoxyHandler.Instance.RunningPort;
-                        Global.pacPort = Global.sysAgentPort + 1;
+                        Global.httpPort = PrivoxyHandler.Instance.RunningPort;
+                        Global.pacPort = config.GetLocalPort("pac");
                     }
                 }
             }
@@ -120,16 +100,11 @@ namespace v2rayN.HttpProxyHandler
         {
             try
             {
-                ////开启全局代理则关闭
-                //if (Global.sysAgent)
-                //{
                 PrivoxyHandler.Instance.Stop();
 
                 Global.sysAgent = false;
                 Global.socksPort = 0;
-                Global.sysAgentPort = 0;
-                Global.pacPort = 0;
-                //}
+                Global.httpPort = 0; 
             }
             catch
             {
@@ -151,7 +126,7 @@ namespace v2rayN.HttpProxyHandler
             }
             else
             {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                 if (localPort != Global.socksPort)
                 {
                     isRestart = true;
@@ -168,9 +143,7 @@ namespace v2rayN.HttpProxyHandler
 
         public static string GetPacUrl()
         {
-            string pacUrl = string.Format("http://127.0.0.1:{0}/pac/?t={1}", Global.pacPort,
-                          GetTimestamp(DateTime.Now));
-
+            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={ DateTime.Now.ToString("HHmmss")}";
             return pacUrl;
         }
     }

v2rayN/v2rayN/HttpProxyHandler/PACFileWatcherHandle.cs

@@ -1,45 +0,0 @@
-using System.IO;
-using System.Windows.Forms;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 提供PAC功能支持
-    /// </summary>
-    class PACFileWatcherHandle
-    {
-        private static FileSystemWatcher fileSystemWatcher;
-
-        private static long fileSize;
-
-        public static void StartWatch(Config config)
-        {
-            if (fileSystemWatcher == null)
-            {
-                fileSystemWatcher = new FileSystemWatcher(Utils.StartupPath());
-                fileSystemWatcher.Filter = "pac.txt";
-                fileSystemWatcher.NotifyFilter = NotifyFilters.Size;
-                fileSystemWatcher.Changed += (sender, args) =>
-                {
-                    var fileInfo = new FileInfo(args.FullPath);
-                    if (fileSize != fileInfo.Length)
-                    {
-                        fileSize = fileInfo.Length;
-                        HttpProxyHandle.ReSetPACProxy(config);
-                    }
-                    
-                };
-            }
-            fileSystemWatcher.EnableRaisingEvents = true;
-        }
-
-        public static void StopWatch()
-        {
-            if (fileSystemWatcher != null)
-            {
-                fileSystemWatcher.EnableRaisingEvents = false;
-            }
-        }
-    }
-}

v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 
@@ -46,7 +47,7 @@ namespace v2rayN.HttpProxyHandler
             //{
             //    throw new Exception("未发现HTTP代理，无法设置代理更新");
             //}
-            WebClient http = new WebClient();
+            var http = new WebClientEx();
             //http.Headers.Add("Connection", "Close");
             //http.Proxy = new WebProxy(IPAddress.Loopback.ToString(), httpProxy.localPort);
             http.DownloadStringCompleted += http_DownloadStringCompleted;
@@ -75,7 +76,7 @@ namespace v2rayN.HttpProxyHandler
         public static List<string> ParseResult(string response)
         {
             byte[] bytes = Convert.FromBase64String(response);
-            string content = Encoding.ASCII.GetString(bytes);
+            string content = Encoding.UTF8.GetString(bytes);
             List<string> valid_lines = new List<string>();
             using (var sr = new StringReader(content))
             {

v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs

@@ -1,12 +1,11 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Text;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
+using v2rayN.Base;
 
 namespace v2rayN.HttpProxyHandler
 {
@@ -15,64 +14,106 @@ namespace v2rayN.HttpProxyHandler
     /// </summary>
     class PACServerHandle
     {
-        private static Hashtable httpWebServer = new Hashtable();
-        private static Hashtable pacList = new Hashtable();
+        private static int pacPort = 0;
+        private static HttpWebServer server;
+        private static HttpWebServerB serverB;
 
-        public static void Init(Config config)
+        public static bool IsRunning
         {
-            InitServer("127.0.0.1");
-
-            if (config.allowLANConn)
+            get
             {
-                List<string> lstIPAddress = Utils.GetHostIPAddress();
-                if (lstIPAddress.Count <= 0)
-                {
-                    return;
-                }
-                foreach (string str in lstIPAddress)
-                {
-                    InitServer(str);
-                }
+                return (pacPort > 0);
             }
         }
 
-        public static void InitServer(string address)
+        public static void Init(Config config)
+        {
+            Global.pacPort = config.GetLocalPort("pac");
+
+            if (InitServer("*"))
+            {
+                pacPort = Global.pacPort;
+            }
+            //else if (InitServer(Global.Loopback))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
+            else if (InitServerB(Global.Loopback))
+            {
+                pacPort = Global.pacPort;
+            }
+            else
+            {
+                Utils.SaveLog("Webserver init failed ");
+                pacPort = 0;
+            }
+        }
+
+        private static bool InitServer(string address)
         {
             try
             {
-                if (!pacList.ContainsKey(address))
+                if (pacPort != Global.pacPort)
                 {
-                    pacList.Add(address, GetPacList(address));
-                }
-
-                string prefixes = string.Format("http://{0}:{1}/pac/", address, Global.pacPort);
-                Utils.SaveLog("Webserver prefixes " + prefixes);
-
-                HttpWebServer ws = new HttpWebServer(SendResponse, prefixes);
-                ws.Run();
-
-                if (!httpWebServer.ContainsKey(address) && ws != null)
-                {
-                    httpWebServer.Add(address, ws);
+                    if (server != null)
+                    {
+                        server.Stop();
+                        server = null;
+                    }
+
+                    if (server == null)
+                    {
+                        string prefixes = string.Format("http://{0}:{1}/pac/", address, Global.pacPort);
+                        Utils.SaveLog("Webserver prefixes " + prefixes);
+
+                        server = new HttpWebServer(SendResponse, prefixes);
+                        server.Run();
+
+                    }
                 }
+                Utils.SaveLog("Webserver at " + address);
             }
             catch (Exception ex)
             {
                 Utils.SaveLog("Webserver InitServer " + ex.Message);
+                return false;
             }
+            return true;
         }
 
-        public static string SendResponse(HttpListenerRequest request)
+        public static bool InitServerB(string address)
         {
             try
             {
-                string[] arrAddress = request.UserHostAddress.Split(':');
-                string address = "127.0.0.1";
-                if (arrAddress.Length > 0)
+                if (pacPort != Global.pacPort)
                 {
-                    address = arrAddress[0];
+                    if (serverB != null)
+                    {
+                        serverB.Stop();
+                        serverB = null;
+                    }
+
+                    if (serverB == null)
+                    {
+                        serverB = new HttpWebServerB(Global.pacPort, SendResponse);
+                    }
                 }
-                return pacList[address].ToString();
+                Utils.SaveLog("WebserverB at " + address);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("WebserverB InitServer " + ex.Message);
+                return false;
+            }
+            return true;
+        }
+
+        public static string SendResponse(string address)
+        {
+            try
+            {
+                var pac = GetPacList(address);
+                return pac;
             }
             catch (Exception ex)
             {
@@ -81,31 +122,49 @@ namespace v2rayN.HttpProxyHandler
             }
         }
 
-
         public static void Stop()
         {
             try
             {
-                if (httpWebServer == null)
+                if (server != null)
                 {
-                    return;
+                    server.Stop();
+                    server = null;
                 }
-                foreach (var key in httpWebServer.Keys)
+                if (serverB != null)
                 {
-                    Utils.SaveLog("Webserver Stop " + key.ToString());
-                    ((HttpWebServer)httpWebServer[key]).Stop();
+                    serverB.Stop();
+                    serverB = null;
                 }
-                httpWebServer.Clear();
             }
             catch (Exception ex)
             {
                 Utils.SaveLog("Webserver Stop " + ex.Message);
             }
+
+            //try
+            //{
+            //    if (httpWebServer == null)
+            //    {
+            //        return;
+            //    }
+            //    foreach (var key in httpWebServer.Keys)
+            //    {
+            //        Utils.SaveLog("Webserver Stop " + key.ToString());
+            //        ((HttpWebServer)httpWebServer[key]).Stop();
+            //    }
+            //    httpWebServer.Clear();
+            //}
+            //catch (Exception ex)
+            //{
+            //    Utils.SaveLog("Webserver Stop " + ex.Message);
+            //}
         }
 
+
         private static string GetPacList(string address)
         {
-            var port = Global.sysAgentPort;
+            var port = Global.httpPort;
             if (port <= 0)
             {
                 return "No port";
@@ -126,8 +185,10 @@ namespace v2rayN.HttpProxyHandler
                 return pac;
             }
             catch
-            { }
+            {
+            }
             return "No pac content";
         }
+
     }
 }

v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs

@@ -24,8 +24,6 @@ namespace v2rayN.HttpProxyHandler
         private static string _uniqueConfigFile;
         private static Job _privoxyJob;
         private Process _process;
-        private int _runningPort;
-        private bool _isRunning;
 
         static PrivoxyHandler()
         {
@@ -36,7 +34,6 @@ namespace v2rayN.HttpProxyHandler
                 _privoxyJob = new Job();
 
                 FileManager.UncompressFile(Utils.GetTempPath("v2ray_privoxy.exe"), Resources.privoxy_exe);
-                FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll);
             }
             catch (IOException ex)
             {
@@ -66,18 +63,7 @@ namespace v2rayN.HttpProxyHandler
 
         public int RunningPort
         {
-            get
-            {
-                return _runningPort;
-            }
-        }
-
-        public bool IsRunning
-        {
-            get
-            {
-                return _isRunning;
-            }
+            get; set;
         }
 
         public void Start(int localPort, Config config)
@@ -90,16 +76,16 @@ namespace v2rayN.HttpProxyHandler
                     KillProcess(p);
                 }
                 string privoxyConfig = Resources.privoxy_conf;
-                _runningPort = GetFreePort(localPort);
+                RunningPort = config.GetLocalPort(Global.InboundHttp);
                 privoxyConfig = privoxyConfig.Replace("__SOCKS_PORT__", localPort.ToString());
-                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", _runningPort.ToString());
+                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", RunningPort.ToString());
                 if (config.allowLANConn)
                 {
                     privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "0.0.0.0");
                 }
                 else
                 {
-                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "127.0.0.1");
+                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", Global.Loopback);
                 }
                 FileManager.ByteArrayToFile(Utils.GetTempPath(_uniqueConfigFile), Encoding.UTF8.GetBytes(privoxyConfig));
 
@@ -123,7 +109,7 @@ namespace v2rayN.HttpProxyHandler
                  * when ss exit unexpectedly, this process will be forced killed by system.
                  */
                 _privoxyJob.AddProcess(_process.Handle);
-                _isRunning = true;
+
             }
         }
 
@@ -134,7 +120,7 @@ namespace v2rayN.HttpProxyHandler
                 KillProcess(_process);
                 _process.Dispose();
                 _process = null;
-                _isRunning = false;
+                RunningPort = 0;
             }
         }
 
@@ -191,25 +177,5 @@ namespace v2rayN.HttpProxyHandler
             }
         }
 
-        private int GetFreePort(int localPort)
-        {
-            int defaultPort = 8123;
-            try
-            {
-                //// TCP stack please do me a favor
-                //TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-                //l.Start();
-                //var port = ((IPEndPoint)l.LocalEndpoint).Port;
-                //l.Stop();
-                //return port;
-                return localPort + 1;
-            }
-            catch (Exception ex)
-            {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
-            }
-        }
     }
 }

v2rayN/v2rayN/HttpProxyHandler/ProxySetting.cs

@@ -0,0 +1,187 @@
+using Microsoft.Win32;
+using System;
+using System.Runtime.InteropServices;
+
+namespace v2rayN.HttpProxyHandler
+{
+    class ProxySetting
+    {
+        public static bool UnsetProxy()
+        {
+            return SetProxy(null, null);
+        }
+        public static bool SetProxy(string strProxy)
+        {
+            return SetProxy(strProxy, null);
+        }
+
+        public static bool SetProxy(string strProxy, string exceptions)
+        {
+            InternetPerConnOptionList list = new InternetPerConnOptionList();
+
+            int optionCount = Utils.IsNullOrEmpty(strProxy) ? 1 : (Utils.IsNullOrEmpty(exceptions) ? 2 : 3);
+            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
+            // USE a proxy server ...
+            options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+            options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
+            // use THIS proxy server
+            if (optionCount > 1)
+            {
+                options[1].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
+                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy);
+                // except for these addresses ...
+                if (optionCount > 2)
+                {
+                    options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
+                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions);
+                }
+            }
+
+            // default stuff
+            list.dwSize = Marshal.SizeOf(list);
+            list.szConnection = IntPtr.Zero;
+            list.dwOptionCount = options.Length;
+            list.dwOptionError = 0;
+
+
+            int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
+            // make a pointer out of all that ...
+            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length);
+            // copy the array over into that spot in memory ...
+            for (int i = 0; i < options.Length; ++i)
+            {
+                IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
+                Marshal.StructureToPtr(options[i], opt, false);
+            }
+
+            list.options = optionsPtr;
+
+            // and then make a pointer out of the whole list
+            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((Int32)list.dwSize);
+            Marshal.StructureToPtr(list, ipcoListPtr, false);
+
+            // and finally, call the API method!
+            int returnvalue = NativeMethods.InternetSetOption(IntPtr.Zero,
+               InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
+               ipcoListPtr, list.dwSize) ? -1 : 0;
+            if (returnvalue == 0)
+            {  // get the error codes, they might be helpful
+                returnvalue = Marshal.GetLastWin32Error();
+            }
+            // FREE the data ASAP
+            Marshal.FreeCoTaskMem(optionsPtr);
+            Marshal.FreeCoTaskMem(ipcoListPtr);
+            if (returnvalue > 0)
+            {  // throw the error codes, they might be helpful
+                //throw new Win32Exception(Marshal.GetLastWin32Error());
+            }
+
+            return (returnvalue < 0);
+        }
+
+
+        #region WinInet structures
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public struct InternetPerConnOptionList
+        {
+            public int dwSize;               // size of the INTERNET_PER_CONN_OPTION_LIST struct
+            public IntPtr szConnection;         // connection name to set/query options
+            public int dwOptionCount;        // number of options to set/query
+            public int dwOptionError;           // on error, which option failed
+            //[MarshalAs(UnmanagedType.)]
+            public IntPtr options;
+        };
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public struct InternetConnectionOption
+        {
+            static readonly int Size;
+            public PerConnOption m_Option;
+            public InternetConnectionOptionValue m_Value;
+            static InternetConnectionOption()
+            {
+                InternetConnectionOption.Size = Marshal.SizeOf(typeof(InternetConnectionOption));
+            }
+
+            // Nested Types
+            [StructLayout(LayoutKind.Explicit)]
+            public struct InternetConnectionOptionValue
+            {
+                // Fields
+                [FieldOffset(0)]
+                public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
+                [FieldOffset(0)]
+                public int m_Int;
+                [FieldOffset(0)]
+                public IntPtr m_StringPtr;
+            }
+        }
+        #endregion
+
+        #region WinInet enums
+        //
+        // options manifests for Internet{Query|Set}Option
+        //
+        public enum InternetOption : uint
+        {
+            INTERNET_OPTION_PER_CONNECTION_OPTION = 75
+        }
+
+        //
+        // Options used in INTERNET_PER_CONN_OPTON struct
+        //
+        public enum PerConnOption
+        {
+            INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags 
+            INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.  
+            INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.  
+            INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.  
+
+        }
+
+        //
+        // PER_CONN_FLAGS
+        //
+        [Flags]
+        public enum PerConnFlags
+        {
+            PROXY_TYPE_DIRECT = 0x00000001,  // direct to net
+            PROXY_TYPE_PROXY = 0x00000002,  // via named proxy
+            PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
+            PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
+        }
+        #endregion
+
+        internal static class NativeMethods
+        {
+            [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength);
+        }
+
+        //判断是否使用代理
+        public static bool UsedProxy()
+        {
+            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
+            if (rk.GetValue("ProxyEnable").ToString() == "1")
+            {
+                rk.Close();
+                return true;
+            }
+            else
+            {
+                rk.Close();
+                return false;
+            }
+        }
+        //获得代理的IP和端口
+        public static string GetProxyProxyServer()
+        {
+            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
+            string ProxyServer = rk.GetValue("ProxyServer").ToString();
+            rk.Close();
+            return ProxyServer;
+            
+        }
+    }
+}

v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs

@@ -1,8 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
@@ -49,14 +50,14 @@ namespace v2rayN.HttpProxyHandler
 
         public static void SetIEProxy(bool enable, bool global, string proxyServer, string pacURL)
         {
-            Read();
+            //Read();
 
-            if (!_userSettings.UserSettingsRecorded)
-            {
-                // record user settings
-                ExecSysproxy("query");
-                ParseQueryStr(_queryStr);
-            }
+            //if (!_userSettings.UserSettingsRecorded)
+            //{
+            //    // record user settings
+            //    ExecSysproxy("query");
+            //    ParseQueryStr(_queryStr);
+            //}
 
             string arguments;
             if (enable)
@@ -71,17 +72,19 @@ namespace v2rayN.HttpProxyHandler
             else
             {
                 // restore user settings
-                var flags = _userSettings.Flags;
-                var proxy_server = _userSettings.ProxyServer ?? "-";
-                var bypass_list = _userSettings.BypassList ?? "-";
-                var pac_url = _userSettings.PacUrl ?? "-";
-                arguments = string.Format("set {0} {1} {2} {3}", flags, proxy_server, bypass_list, pac_url);
+                //var flags = _userSettings.Flags;
+                //var proxy_server = _userSettings.ProxyServer ?? "-";
+                //var bypass_list = _userSettings.BypassList ?? "-";
+                //var pac_url = _userSettings.PacUrl ?? "-";
+                ////arguments = string.Format("set {0} {1} {2} {3}", flags, proxy_server, bypass_list, pac_url);
+                //set null settings
+                arguments = string.Format("set {0} {1} {2} {3}", 1, "-", "<local>", @"http://127.0.0.1");
 
                 // have to get new settings
-                _userSettings.UserSettingsRecorded = false;
+                //_userSettings.UserSettingsRecorded = false;
             }
 
-            Save();
+            //Save();
             ExecSysproxy(arguments);
         }
 

v2rayN/v2rayN/HttpProxyHandler/WebClientEx.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Net;
-
-namespace v2rayN.HttpProxyHandler
-{
-    class WebClientEx : WebClient
-    {
-        public int Timeout { get; set; }
-        public WebClientEx(int timeout = 3000)
-        {
-            Timeout = timeout;
-        }
-
-
-        protected override WebRequest GetWebRequest(Uri address)
-        {
-            var request = base.GetWebRequest(address);
-            request.Timeout = Timeout;
-            return request;
-        }
-    }
-}

v2rayN/v2rayN/Mode/Config.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using v2rayN.Base;
 
 namespace v2rayN.Mode
 {
@@ -13,96 +13,189 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听
         /// </summary>
-        public List<InItem> inbound { get; set; }
+        public List<InItem> inbound
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许日志
         /// </summary>
-        public bool logEnabled { get; set; }
+        public bool logEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 日志等级
         /// </summary>
-        public string loglevel { get; set; }
+        public string loglevel
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 活动配置序号
         /// </summary>
-        public int index { get; set; }
+        public int index
+        {
+            get; set;
+        }
 
         /// <summary>
         /// vmess服务器信息
         /// </summary>
-        public List<VmessItem> vmess { get; set; }
+        public List<VmessItem> vmess
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许Mux多路复用
         /// </summary>
-        public bool muxEnabled { get; set; }
+        public bool muxEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 域名解析策略
         /// </summary>
-        public string domainStrategy { get; set; }
+        public string domainStrategy
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 路由模式
         /// </summary>
-        public string routingMode { get; set; }
+        public string routingMode
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义需代理的网址或ip
         /// </summary>
-        public List<string> useragent { get; set; }
+        public List<string> useragent
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义直连的网址或ip
         /// </summary>
-        public List<string> userdirect { get; set; }
+        public List<string> userdirect
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义阻止的网址或ip
         /// </summary>
-        public List<string> userblock { get; set; }
+        public List<string> userblock
+        {
+            get; set;
+        }
 
         /// <summary>
         /// KcpItem
         /// </summary>
-        public KcpItem kcpItem { get; set; }
+        public KcpItem kcpItem
+        {
+            get; set;
+        }
 
 
         /// <summary>
         /// 启用Http代理
         /// </summary>
-        public bool sysAgentEnabled { get; set; }
+        public bool sysAgentEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 监听状态 0-不改变 1-全局 2-PAC
         /// </summary>
-        public int listenerType { get; set; }
+        public int listenerType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 自定义GFWList url
         /// </summary>
-        public string urlGFWList { get; set; }
+        public string urlGFWList
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许来自局域网的连接
         /// </summary>
-        public bool allowLANConn { get; set; }
+        public bool allowLANConn
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 启用实时网速和流量统计
+        /// </summary>
+        public bool enableStatistics
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 视图刷新率
+        /// </summary>
+        public int statisticsFreshRate
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 统计数据缓存天数 [0, 30]
+        ///     * 0 关闭单独每天使用流量的缓存
+        ///     * 无论如何不会关闭总流量的缓存
+        /// </summary>
+        private uint cacheDays;
+        public uint CacheDays
+        {
+            get
+            {
+                return cacheDays;
+            }
+            set
+            {
+                if (value < 0) cacheDays = 0;
+                else if (value > 30) cacheDays = 30;
+                else cacheDays = value;
+            }
+        }
 
         /// <summary>
         /// 自定义远程DNS
         /// </summary>
-        public string remoteDNS { get; set; }
+        public string remoteDNS
+        {
+            get; set;
+        }
         /// <summary>
         /// 订阅
         /// </summary>
-        public List<SubItem> subItem { get; set; }
+        public List<SubItem> subItem
+        {
+            get; set;
+        }
         /// <summary>
         /// UI
         /// </summary>
-        public UIItem uiItem { get; set; }
+        public UIItem uiItem
+        {
+            get; set;
+        }
 
         #region 函数
 
@@ -112,7 +205,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].address;
+            return vmess[index].address.TrimEx();
         }
 
         public int port()
@@ -130,7 +223,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].id;
+            return vmess[index].id.TrimEx();
         }
 
         public int alterId()
@@ -148,7 +241,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].security;
+            return vmess[index].security.TrimEx();
         }
 
         public string remarks()
@@ -157,7 +250,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].remarks;
+            return vmess[index].remarks.TrimEx();
         }
         public string network()
         {
@@ -165,7 +258,7 @@ namespace v2rayN.Mode
             {
                 return Global.DefaultNetwork;
             }
-            return vmess[index].network;
+            return vmess[index].network.TrimEx();
         }
         public string headerType()
         {
@@ -173,7 +266,7 @@ namespace v2rayN.Mode
             {
                 return Global.None;
             }
-            return vmess[index].headerType.Replace(" ", "").Trim();
+            return vmess[index].headerType.Replace(" ", "").TrimEx();
         }
         public string requestHost()
         {
@@ -181,7 +274,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].requestHost.Replace(" ", "").Trim();
+            return vmess[index].requestHost.Replace(" ", "").TrimEx();
         }
         public string path()
         {
@@ -189,7 +282,7 @@ namespace v2rayN.Mode
             {
                 return string.Empty;
             }
-            return vmess[index].path.Replace(" ", "").Trim();
+            return vmess[index].path.Replace(" ", "").TrimEx();
         }
         public string streamSecurity()
         {
@@ -210,6 +303,19 @@ namespace v2rayN.Mode
 
         public int GetLocalPort(string protocol)
         {
+            if (protocol == Global.InboundHttp)
+            {
+                return GetLocalPort(Global.InboundSocks) + 1;
+            }
+            else if (protocol == "pac")
+            {
+                return GetLocalPort(Global.InboundSocks) + 2;
+            }
+            else if (protocol == "speedtest")
+            {
+                return GetLocalPort(Global.InboundSocks) + 103;
+            }
+
             int localPort = 0;
             foreach (InItem inItem in inbound)
             {
@@ -326,77 +432,125 @@ namespace v2rayN.Mode
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
-        public int configVersion { get; set; }
+        public int configVersion
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string address { get; set; }
+        public string address
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public int port { get; set; }
+        public int port
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public int alterId { get; set; }
+        public int alterId
+        {
+            get; set;
+        }
         /// <summary>
         /// 本地安全策略
         /// </summary>
-        public string security { get; set; }
+        public string security
+        {
+            get; set;
+        }
         /// <summary>
         /// tcp,kcp,ws
         /// </summary>
-        public string network { get; set; }
+        public string network
+        {
+            get; set;
+        }
         /// <summary>
         /// 备注或别名
         /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string headerType { get; set; }
+        public string headerType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string requestHost { get; set; }
+        public string requestHost
+        {
+            get; set;
+        }
 
         /// <summary>
         /// ws h2 path
         /// </summary>
-        public string path { get; set; }
+        public string path
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 底层传输安全
         /// </summary>
-        public string streamSecurity { get; set; }
+        public string streamSecurity
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public string allowInsecure { get; set; }
+        public string allowInsecure
+        {
+            get; set;
+        }
 
 
         /// <summary>
         /// config type(1=normal,2=custom)
         /// </summary>
-        public int configType { get; set; }
+        public int configType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 
         /// </summary>
-        public string testResult { get; set; }
+        public string testResult
+        {
+            get; set;
+        }
 
         /// <summary>
         /// SubItem id
         /// </summary>
-        public string subid { get; set; }
+        public string subid
+        {
+            get; set;
+        }
     }
 
     [Serializable]
@@ -405,17 +559,26 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听端口
         /// </summary>
-        public int localPort { get; set; }
+        public int localPort
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 协议，默认为socks
         /// </summary>
-        public string protocol { get; set; }
+        public string protocol
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许udp
         /// </summary>
-        public bool udpEnabled { get; set; }
+        public bool udpEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 开启流量探测
@@ -429,31 +592,52 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public int mtu { get; set; }
+        public int mtu
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int tti { get; set; }
+        public int tti
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int uplinkCapacity { get; set; }
+        public int uplinkCapacity
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int downlinkCapacity { get; set; }
+        public int downlinkCapacity
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public bool congestion { get; set; }
+        public bool congestion
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int readBufferSize { get; set; }
+        public int readBufferSize
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int writeBufferSize { get; set; }
+        public int writeBufferSize
+        {
+            get; set;
+        }
     }
 
 
@@ -463,17 +647,26 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 备注
         /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }
 
         /// <summary>
         /// url
         /// </summary>
-        public string url { get; set; }
+        public string url
+        {
+            get; set;
+        }
 
         /// <summary>
         /// enable

v2rayN/v2rayN/Mode/ServerStatistics.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace v2rayN.Mode
+{
+    class ServerStatistics
+    {
+        public string name;
+        public string address;
+        public int port;
+        public string path;
+        public string host;
+        public ulong totalUp;
+        public ulong totalDown;
+        public ulong todayUp;
+        public ulong todayDown;
+
+        public ServerStatistics() { }
+        public ServerStatistics(string name, string addr, int port, string path, string host, ulong totalUp, ulong totalDown, ulong todayUp, ulong todayDown)
+        {
+            this.name = name;
+            this.address = addr;
+            this.port = port;
+            this.path = path;
+            this.host = host;
+            this.totalUp = totalUp;
+            this.totalDown = totalDown;
+            this.todayUp = todayUp;
+            this.todayDown = todayDown;
+        }
+    }
+}

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -21,6 +21,17 @@ namespace v2rayN.Mode
         /// </summary>
         public List<Outbounds> outbounds { get; set; }
 
+        /// <summary>
+        /// 统计需要， 空对象
+        /// </summary>
+        public Stats stats { get; set; }
+       
+        /// </summary>
+        public API api { get; set; }
+
+        /// </summary>
+        public Policy policy;
+
         /// <summary>
         /// DNS 配置
         /// </summary>
@@ -31,6 +42,25 @@ namespace v2rayN.Mode
         public Routing routing { get; set; }
     }
 
+    public class Stats { };
+
+    public class API
+    {
+        public string tag { get; set; }
+        public List<string> services { get; set; }
+    }
+
+    public class Policy
+    {
+        public SystemPolicy system;
+    }
+
+    public class SystemPolicy
+    {
+        public bool statsInboundUplink;
+        public bool statsInboundDownlink;
+    }
+
     public class Log
     {
         /// <summary>
@@ -49,6 +79,7 @@ namespace v2rayN.Mode
 
     public class Inbounds
     {
+        public string tag { get; set; }
         /// <summary>
         /// 
         /// </summary>
@@ -92,6 +123,11 @@ namespace v2rayN.Mode
         /// </summary>
         public string ip { get; set; }
 
+        /// <summary>
+        /// api 使用
+        /// </summary>
+        public string address { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
@@ -215,8 +251,30 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public int level { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<SocksUsersItem> users { get; set; }
     }
 
+    public class SocksUsersItem
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string user { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string pass { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int level { get; set; }
+    }
+
+
     public class Mux
     {
         /// <summary>
@@ -251,6 +309,8 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public string port { get; set; }
+
+        public string inboundTag { get; set; }
         /// <summary>
         /// 
         /// </summary>

v2rayN/v2rayN/Mode/VmessQRCode.cs

@@ -8,46 +8,46 @@ namespace v2rayN.Mode
         /// <summary>
         /// 版本
         /// </summary>
-        public string v { get; set; }
+        public string v { get; set; } = string.Empty;
         /// <summary>
         /// 备注
         /// </summary>
-        public string ps { get; set; }
+        public string ps { get; set; } = string.Empty;
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string add { get; set; }
+        public string add { get; set; } = string.Empty;
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public string port { get; set; }
+        public string port { get; set; } = string.Empty;
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id { get; set; }
+        public string id { get; set; } = string.Empty;
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public string aid { get; set; }
+        public string aid { get; set; } = string.Empty;
         /// <summary>
         /// 传输协议tcp,kcp,ws
         /// </summary>
-        public string net { get; set; }
+        public string net { get; set; } = string.Empty;
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string type { get; set; }
+        public string type { get; set; } = string.Empty;
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string host { get; set; }
+        public string host { get; set; } = string.Empty;
         /// <summary>
         /// path
         /// </summary>
-        public string path { get; set; }
+        public string path { get; set; } = string.Empty;
         /// <summary>
         /// 底层传输安全
         /// </summary>
-        public string tls { get; set; }
-    }
+        public string tls { get; set; } = string.Empty;
+    }    
 }

v2rayN/v2rayN/Program.cs

@@ -28,6 +28,7 @@ namespace v2rayN
 
             AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
 
+
             Process instance = RunningInstance();
             if (instance == null)
             {
@@ -43,7 +44,7 @@ namespace v2rayN
             }
             else
             {
-                UI.Show("v2rayN is already running(v2rayN已经运行)");
+                UI.Show($"v2rayN is already running(v2rayN已经运行)");
             }
         }
 
@@ -51,7 +52,7 @@ namespace v2rayN
         {
             try
             {
-                string resourceName = "v2rayN." + new AssemblyName(args.Name).Name + ".dll";
+                string resourceName = "v2rayN.LIB." + new AssemblyName(args.Name).Name + ".dll";
                 using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName))
                 {
                     if (stream == null)

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("v2rayN")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.30")]
+[assembly: AssemblyFileVersion("2.47")]

v2rayN/v2rayN/Properties/Resources.Designer.cs

@@ -90,6 +90,26 @@ namespace v2rayN.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] grpc_csharp_ext_x64_dll {
+            get {
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x64_dll", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] grpc_csharp_ext_x86_dll {
+            get {
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x86_dll", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -101,21 +121,21 @@ namespace v2rayN.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static byte[] mgwz_dll {
+        internal static System.Drawing.Bitmap minimize {
             get {
-                object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture);
-                return ((byte[])(obj));
+                object obj = ResourceManager.GetObject("minimize", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap minimize {
+        internal static System.Drawing.Bitmap notify {
             get {
-                object obj = ResourceManager.GetObject("minimize", resourceCulture);
+                object obj = ResourceManager.GetObject("notify", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
@@ -147,6 +167,7 @@ namespace v2rayN.Properties {
         ///show-on-task-bar 0
         ///activity-animation 0
         ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+        ///max-client-connections 2048
         ///hide-console
         /// 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Properties/Resources.resx

@@ -127,15 +127,21 @@
   <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="grpc_csharp_ext_x64_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x64.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpc_csharp_ext_x86_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x86.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="option" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\option.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

v2rayN/v2rayN/Protos/Statistics.proto

@@ -0,0 +1,53 @@
+syntax = "proto3";
+
+package v2ray.core.app.stats.command;
+option csharp_namespace = "v2rayN.Protos.Statistics";
+
+message GetStatsRequest {
+  // Name of the stat counter.
+  string name = 1;
+  // Whether or not to reset the counter to fetching its value.
+  bool reset = 2;
+}
+
+message Stat {
+  string name = 1;
+  int64 value = 2;
+}
+
+message GetStatsResponse {
+  Stat stat = 1;
+}
+
+message QueryStatsRequest {
+  string pattern = 1;
+  bool reset = 2;
+}
+
+message QueryStatsResponse {
+  repeated Stat stat = 1;
+}
+
+message SysStatsRequest {
+}
+
+message SysStatsResponse {
+  uint32 NumGoroutine = 1;
+  uint32 NumGC = 2;
+  uint64 Alloc = 3;
+  uint64 TotalAlloc = 4;
+  uint64 Sys = 5;
+  uint64 Mallocs = 6;
+  uint64 Frees = 7;
+  uint64 LiveObjects = 8;
+  uint64 PauseTotalNs = 9;
+  uint32 Uptime = 10;
+}
+
+service StatsService {
+  rpc GetStats(GetStatsRequest) returns (GetStatsResponse) {}
+  rpc QueryStats(QueryStatsRequest) returns (QueryStatsResponse) {}
+  rpc GetSysStats(SysStatsRequest) returns (SysStatsResponse) {}
+}
+
+message Config {}

v2rayN/v2rayN/Resources/privoxy_conf.txt

@@ -4,4 +4,5 @@ logfile v2ray_privoxy.log
 show-on-task-bar 0
 activity-animation 0
 forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+max-client-connections 2048
 hide-console

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -19,7 +19,7 @@ namespace v2rayN.Resx {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class ResUI {
@@ -47,7 +47,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性
         ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
@@ -105,6 +105,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DOWN 的本地化字符串。
+        /// </summary>
+        internal static string downloadSpeed {
+            get {
+                return ResourceManager.GetString("downloadSpeed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Whether to download? {0} 的本地化字符串。
         /// </summary>
@@ -321,6 +330,42 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Today download traffic 的本地化字符串。
+        /// </summary>
+        internal static string LvTodayDownloadDataAmount {
+            get {
+                return ResourceManager.GetString("LvTodayDownloadDataAmount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Today upload traffic 的本地化字符串。
+        /// </summary>
+        internal static string LvTodayUploadDataAmount {
+            get {
+                return ResourceManager.GetString("LvTodayUploadDataAmount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Total download traffic 的本地化字符串。
+        /// </summary>
+        internal static string LvTotalDownloadDataAmount {
+            get {
+                return ResourceManager.GetString("LvTotalDownloadDataAmount", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Total upload traffic 的本地化字符串。
+        /// </summary>
+        internal static string LvTotalUploadDataAmount {
+            get {
+                return ResourceManager.GetString("LvTotalUploadDataAmount", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport 的本地化字符串。
         /// </summary>
@@ -330,6 +375,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 MediumFresh 的本地化字符串。
+        /// </summary>
+        internal static string MediumFresh {
+            get {
+                return ResourceManager.GetString("MediumFresh", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Clear original subscription content 的本地化字符串。
         /// </summary>
@@ -582,6 +636,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 QuickFresh 的本地化字符串。
+        /// </summary>
+        internal static string QuickFresh {
+            get {
+                return ResourceManager.GetString("QuickFresh", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Are you sure to remove the server? 的本地化字符串。
         /// </summary>
@@ -609,6 +672,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 SlowFresh 的本地化字符串。
+        /// </summary>
+        internal static string SlowFresh {
+            get {
+                return ResourceManager.GetString("SlowFresh", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node! 的本地化字符串。
         /// </summary>
@@ -618,6 +690,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。
+        /// </summary>
+        internal static string StartPacFailed {
+            get {
+                return ResourceManager.GetString("StartPacFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Start service ({0})...... 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -319,4 +319,31 @@
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
     <value>Update V2rayCore successfully! Restarting service...</value>
   </data>
+  <data name="MediumFresh" xml:space="preserve">
+    <value>MediumFresh</value>
+  </data>
+  <data name="QuickFresh" xml:space="preserve">
+    <value>QuickFresh</value>
+  </data>
+  <data name="SlowFresh" xml:space="preserve">
+    <value>SlowFresh</value>
+  </data>
+  <data name="downloadSpeed" xml:space="preserve">
+    <value>DOWN</value>
+  </data>
+  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
+    <value>Today download traffic</value>
+  </data>
+  <data name="LvTodayUploadDataAmount" xml:space="preserve">
+    <value>Today upload traffic</value>
+  </data>
+  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
+    <value>Total download traffic</value>
+  </data>
+  <data name="LvTotalUploadDataAmount" xml:space="preserve">
+    <value>Total upload traffic</value>
+  </data>
+  <data name="StartPacFailed" xml:space="preserve">
+    <value>PAC failed to start. Pls with an administrator.</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -319,4 +319,31 @@
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
     <value>更新V2rayCore成功！正在重启服务...</value>
   </data>
+  <data name="MediumFresh" xml:space="preserve">
+    <value>中等</value>
+  </data>
+  <data name="QuickFresh" xml:space="preserve">
+    <value>快</value>
+  </data>
+  <data name="SlowFresh" xml:space="preserve">
+    <value>慢</value>
+  </data>
+  <data name="downloadSpeed" xml:space="preserve">
+    <value>下载</value>
+  </data>
+  <data name="LvTodayDownloadDataAmount" xml:space="preserve">
+    <value>今日下载</value>
+  </data>
+  <data name="LvTodayUploadDataAmount" xml:space="preserve">
+    <value>今日上传</value>
+  </data>
+  <data name="LvTotalDownloadDataAmount" xml:space="preserve">
+    <value>总下载</value>
+  </data>
+  <data name="LvTotalUploadDataAmount" xml:space="preserve">
+    <value>总上传</value>
+  </data>
+  <data name="StartPacFailed" xml:space="preserve">
+    <value>PAC服务启动失败,请用管理员启动</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/SampleClientConfig.txt

@@ -1,25 +1,33 @@
-{
+{	 
+	"log": {
+		"access": "",
+		"error": "",
+		"loglevel": "error"
+	},
 	"log": {
 		"access": "Vaccess.log",
 		"error": "Verror.log",
 		"loglevel": "warning"
 	},
-	"inbounds": [{
-		"port": 10808,
-		"protocol": "socks",
-		"listen": "127.0.0.1",
-		"settings": {
-			"auth": "noauth",
-			"udp": true
-		},
-		"sniffing": {
-			"enabled": true,
-			"destOverride": [
-				"http",
-				"tls"
-			]
+	"inbounds": [
+		{
+			"tag": "proxy",
+			"port": 10808,
+			"protocol": "socks",
+			"listen": "127.0.0.1",
+			"settings": {
+				"auth": "noauth",
+				"udp": true
+			},
+			"sniffing": {
+				"enabled": true,
+				"destOverride": [
+					"http",
+					"tls"
+				]
+			}
 		}
-	}],
+	],
 	"outbounds": [{
 			"tag": "proxy",
 			"protocol": "vmess",
@@ -66,6 +74,12 @@
 	],
 	"routing": {
 		"domainStrategy": "IPIfNonMatch",
-		"rules": []
+		"rules": [
+				{
+                    "inboundTag": "api",
+                    "outboundTag": "api",
+                    "type": "field"
+                }
+		]
 	}
 }

v2rayN/v2rayN/Tool/Utils.cs

@@ -17,6 +17,8 @@ using System.Drawing;
 using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
+using System.Security.Principal;
+using v2rayN.Base;
 
 namespace v2rayN
 {
@@ -211,7 +213,7 @@ namespace v2rayN
         {
             try
             {
-                plainText = plainText.Trim()
+                plainText = plainText.TrimEx()
                   .Replace("\n", "")
                   .Replace("\r\n", "")
                   .Replace("\r", "")
@@ -249,6 +251,89 @@ namespace v2rayN
             }
         }
 
+        public static string ToString(object obj)
+        {
+            try
+            {
+                return (obj == null ? string.Empty : obj.ToString());
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// byte 转成 有两位小数点的 方便阅读的数据
+        ///     比如 2.50 MB
+        /// </summary>
+        /// <param name="amount">bytes</param>
+        /// <param name="result">转换之后的数据</param>
+        /// <param name="unit">单位</param>
+        public static void ToHumanReadable(ulong amount, out double result, out string unit)
+        {
+            var factor = 1024u;
+            var KBs = amount / factor;
+            if (KBs > 0)
+            {
+                // multi KB
+                var MBs = KBs / factor;
+                if (MBs > 0)
+                {
+                    // multi MB
+                    var GBs = MBs / factor;
+                    if (GBs > 0)
+                    {
+                        // multi GB
+                        var TBs = GBs / factor;
+                        if (TBs > 0)
+                        {
+                            // 你是魔鬼吗？ 用这么多流量
+                            result = TBs + GBs % factor / (factor + 0.0);
+                            unit = "TB";
+                            return;
+                        }
+                        result = GBs + MBs % factor / (factor + 0.0);
+                        unit = "GB";
+                        return;
+                    }
+                    result = MBs + KBs % factor / (factor + 0.0);
+                    unit = "MB";
+                    return;
+                }
+                result = KBs + amount % factor / (factor + 0.0);
+                unit = "KB";
+                return;
+            }
+            else
+            {
+                result = amount;
+                unit = "B";
+            }
+        }
+
+        public static string HumanFy(ulong amount)
+        {
+            double result;
+            string unit;
+            ToHumanReadable(amount, out result, out unit);
+            return $"{string.Format("{0:f1}", result)}{unit}";
+        }
+
+        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result)
+        {
+            var list = new List<Mode.VmessItem>();
+            foreach (var item in source)
+            {
+                if (!list.Exists(i => item.address == i.address && item.port == i.port && item.path == i.path))
+                {
+                    list.Add(item);
+                }
+            }
+
+            result = list;
+        }
+
         #endregion
 
 
@@ -303,7 +388,7 @@ namespace v2rayN
             }
 
             //清除要验证字符串中的空格
-            //ip = ip.Trim();
+            //ip = ip.TrimEx();
             //可能是CIDR
             if (ip.IndexOf(@"/") > 0)
             {
@@ -339,7 +424,7 @@ namespace v2rayN
             }
 
             //清除要验证字符串中的空格
-            //domain = domain.Trim();
+            //domain = domain.TrimEx();
 
             //模式字符串
             string pattern = @"^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$";
@@ -358,6 +443,15 @@ namespace v2rayN
             return Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase);
         }
 
+        public static bool IsIdenticalServer(Mode.ServerStatistics a, Mode.ServerStatistics b)
+        {
+            return (a.address == b.address
+                    && a.port == b.port
+                    && a.path == b.path
+                    && a.host == b.host
+                );
+        }
+
         #endregion
 
         #region 开机自动启动
@@ -671,6 +765,25 @@ namespace v2rayN
             return string.Empty;
         }
 
+        /// <summary>
+        /// IsAdministrator
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsAdministrator()
+        {
+            try
+            {
+                WindowsIdentity current = WindowsIdentity.GetCurrent();
+                WindowsPrincipal windowsPrincipal = new WindowsPrincipal(current);
+                //WindowsBuiltInRole可以枚举出很多权限，例如系统用户、User、Guest等等
+                return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         #endregion
 
         #region TempPath

v2rayN/v2rayN/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Grpc.Tools" version="2.23.0" targetFramework="net46" developmentDependency="true" />
+</packages>

v2rayN/v2rayN/protos/Command.cs

@@ -1,560 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: command.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace V2Ray.Core.App.Stats.Command {
-
-  /// <summary>Holder for reflection information generated from command.proto</summary>
-  public static partial class CommandReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for command.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static CommandReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cg1jb21tYW5kLnByb3RvEhx2MnJheS5jb3JlLmFwcC5zdGF0cy5jb21tYW5k",
-            "Ii4KD0dldFN0YXRzUmVxdWVzdBIMCgRuYW1lGAEgASgJEg0KBXJlc2V0GAIg",
-            "ASgIIiMKBFN0YXQSDAoEbmFtZRgBIAEoCRINCgV2YWx1ZRgCIAEoAyJEChBH",
-            "ZXRTdGF0c1Jlc3BvbnNlEjAKBHN0YXQYASABKAsyIi52MnJheS5jb3JlLmFw",
-            "cC5zdGF0cy5jb21tYW5kLlN0YXQiCAoGQ29uZmlnMnsKDFN0YXRzU2Vydmlj",
-            "ZRJrCghHZXRTdGF0cxItLnYycmF5LmNvcmUuYXBwLnN0YXRzLmNvbW1hbmQu",
-            "R2V0U3RhdHNSZXF1ZXN0Gi4udjJyYXkuY29yZS5hcHAuc3RhdHMuY29tbWFu",
-            "ZC5HZXRTdGF0c1Jlc3BvbnNlIgBCTAogY29tLnYycmF5LmNvcmUuYXBwLnN0",
-            "YXRzLmNvbW1hbmRQAVoHY29tbWFuZKoCHFYyUmF5LkNvcmUuQXBwLlN0YXRz",
-            "LkNvbW1hbmRiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::V2Ray.Core.App.Stats.Command.GetStatsRequest), global::V2Ray.Core.App.Stats.Command.GetStatsRequest.Parser, new[]{ "Name", "Reset" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::V2Ray.Core.App.Stats.Command.Stat), global::V2Ray.Core.App.Stats.Command.Stat.Parser, new[]{ "Name", "Value" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::V2Ray.Core.App.Stats.Command.GetStatsResponse), global::V2Ray.Core.App.Stats.Command.GetStatsResponse.Parser, new[]{ "Stat" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::V2Ray.Core.App.Stats.Command.Config), global::V2Ray.Core.App.Stats.Command.Config.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GetStatsRequest : pb::IMessage<GetStatsRequest> {
-    private static readonly pb::MessageParser<GetStatsRequest> _parser = new pb::MessageParser<GetStatsRequest>(() => new GetStatsRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetStatsRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::V2Ray.Core.App.Stats.Command.CommandReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsRequest(GetStatsRequest other) : this() {
-      name_ = other.name_;
-      reset_ = other.reset_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsRequest Clone() {
-      return new GetStatsRequest(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// Name of the stat counter.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "reset" field.</summary>
-    public const int ResetFieldNumber = 2;
-    private bool reset_;
-    /// <summary>
-    /// Whether or not to reset the counter to fetching its value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Reset {
-      get { return reset_; }
-      set {
-        reset_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetStatsRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetStatsRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Reset != other.Reset) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Reset != false) hash ^= Reset.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Reset != false) {
-        output.WriteRawTag(16);
-        output.WriteBool(Reset);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Reset != false) {
-        size += 1 + 1;
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetStatsRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Reset != false) {
-        Reset = other.Reset;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Reset = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class Stat : pb::IMessage<Stat> {
-    private static readonly pb::MessageParser<Stat> _parser = new pb::MessageParser<Stat>(() => new Stat());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<Stat> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::V2Ray.Core.App.Stats.Command.CommandReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Stat() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Stat(Stat other) : this() {
-      name_ = other.name_;
-      value_ = other.value_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Stat Clone() {
-      return new Stat(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 2;
-    private long value_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public long Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as Stat);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(Stat other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Value != other.Value) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Value != 0L) hash ^= Value.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Value != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(Value);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Value != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Value);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(Stat other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Value != 0L) {
-        Value = other.Value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Value = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class GetStatsResponse : pb::IMessage<GetStatsResponse> {
-    private static readonly pb::MessageParser<GetStatsResponse> _parser = new pb::MessageParser<GetStatsResponse>(() => new GetStatsResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<GetStatsResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::V2Ray.Core.App.Stats.Command.CommandReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsResponse(GetStatsResponse other) : this() {
-      Stat = other.stat_ != null ? other.Stat.Clone() : null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public GetStatsResponse Clone() {
-      return new GetStatsResponse(this);
-    }
-
-    /// <summary>Field number for the "stat" field.</summary>
-    public const int StatFieldNumber = 1;
-    private global::V2Ray.Core.App.Stats.Command.Stat stat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::V2Ray.Core.App.Stats.Command.Stat Stat {
-      get { return stat_; }
-      set {
-        stat_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as GetStatsResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(GetStatsResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Stat, other.Stat)) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (stat_ != null) hash ^= Stat.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (stat_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Stat);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (stat_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Stat);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(GetStatsResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.stat_ != null) {
-        if (stat_ == null) {
-          stat_ = new global::V2Ray.Core.App.Stats.Command.Stat();
-        }
-        Stat.MergeFrom(other.Stat);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            if (stat_ == null) {
-              stat_ = new global::V2Ray.Core.App.Stats.Command.Stat();
-            }
-            input.ReadMessage(stat_);
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  public sealed partial class Config : pb::IMessage<Config> {
-    private static readonly pb::MessageParser<Config> _parser = new pb::MessageParser<Config>(() => new Config());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<Config> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::V2Ray.Core.App.Stats.Command.CommandReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Config() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Config(Config other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public Config Clone() {
-      return new Config(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as Config);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(Config other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(Config other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code

v2rayN/v2rayN/protos/CommandGrpc.cs

@@ -1,97 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: command.proto
-// </auto-generated>
-#pragma warning disable 1591
-#region Designer generated code
-
-using grpc = global::Grpc.Core;
-
-namespace V2Ray.Core.App.Stats.Command {
-  public static partial class StatsService
-  {
-    static readonly string __ServiceName = "v2ray.core.app.stats.command.StatsService";
-
-    static readonly grpc::Marshaller<global::V2Ray.Core.App.Stats.Command.GetStatsRequest> __Marshaller_GetStatsRequest = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::V2Ray.Core.App.Stats.Command.GetStatsRequest.Parser.ParseFrom);
-    static readonly grpc::Marshaller<global::V2Ray.Core.App.Stats.Command.GetStatsResponse> __Marshaller_GetStatsResponse = grpc::Marshallers.Create((arg) => global::Google.Protobuf.MessageExtensions.ToByteArray(arg), global::V2Ray.Core.App.Stats.Command.GetStatsResponse.Parser.ParseFrom);
-
-    static readonly grpc::Method<global::V2Ray.Core.App.Stats.Command.GetStatsRequest, global::V2Ray.Core.App.Stats.Command.GetStatsResponse> __Method_GetStats = new grpc::Method<global::V2Ray.Core.App.Stats.Command.GetStatsRequest, global::V2Ray.Core.App.Stats.Command.GetStatsResponse>(
-        grpc::MethodType.Unary,
-        __ServiceName,
-        "GetStats",
-        __Marshaller_GetStatsRequest,
-        __Marshaller_GetStatsResponse);
-
-    /// <summary>Service descriptor</summary>
-    public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor
-    {
-      get { return global::V2Ray.Core.App.Stats.Command.CommandReflection.Descriptor.Services[0]; }
-    }
-
-    /// <summary>Base class for server-side implementations of StatsService</summary>
-    public abstract partial class StatsServiceBase
-    {
-      public virtual global::System.Threading.Tasks.Task<global::V2Ray.Core.App.Stats.Command.GetStatsResponse> GetStats(global::V2Ray.Core.App.Stats.Command.GetStatsRequest request, grpc::ServerCallContext context)
-      {
-        throw new grpc::RpcException(new grpc::Status(grpc::StatusCode.Unimplemented, ""));
-      }
-
-    }
-
-    /// <summary>Client for StatsService</summary>
-    public partial class StatsServiceClient : grpc::ClientBase<StatsServiceClient>
-    {
-      /// <summary>Creates a new client for StatsService</summary>
-      /// <param name="channel">The channel to use to make remote calls.</param>
-      public StatsServiceClient(grpc::Channel channel) : base(channel)
-      {
-      }
-      /// <summary>Creates a new client for StatsService that uses a custom <c>CallInvoker</c>.</summary>
-      /// <param name="callInvoker">The callInvoker to use to make remote calls.</param>
-      public StatsServiceClient(grpc::CallInvoker callInvoker) : base(callInvoker)
-      {
-      }
-      /// <summary>Protected parameterless constructor to allow creation of test doubles.</summary>
-      protected StatsServiceClient() : base()
-      {
-      }
-      /// <summary>Protected constructor to allow creation of configured clients.</summary>
-      /// <param name="configuration">The client configuration.</param>
-      protected StatsServiceClient(ClientBaseConfiguration configuration) : base(configuration)
-      {
-      }
-
-      public virtual global::V2Ray.Core.App.Stats.Command.GetStatsResponse GetStats(global::V2Ray.Core.App.Stats.Command.GetStatsRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
-      {
-        return GetStats(request, new grpc::CallOptions(headers, deadline, cancellationToken));
-      }
-      public virtual global::V2Ray.Core.App.Stats.Command.GetStatsResponse GetStats(global::V2Ray.Core.App.Stats.Command.GetStatsRequest request, grpc::CallOptions options)
-      {
-        return CallInvoker.BlockingUnaryCall(__Method_GetStats, null, options, request);
-      }
-      public virtual grpc::AsyncUnaryCall<global::V2Ray.Core.App.Stats.Command.GetStatsResponse> GetStatsAsync(global::V2Ray.Core.App.Stats.Command.GetStatsRequest request, grpc::Metadata headers = null, global::System.DateTime? deadline = null, global::System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
-      {
-        return GetStatsAsync(request, new grpc::CallOptions(headers, deadline, cancellationToken));
-      }
-      public virtual grpc::AsyncUnaryCall<global::V2Ray.Core.App.Stats.Command.GetStatsResponse> GetStatsAsync(global::V2Ray.Core.App.Stats.Command.GetStatsRequest request, grpc::CallOptions options)
-      {
-        return CallInvoker.AsyncUnaryCall(__Method_GetStats, null, options, request);
-      }
-      /// <summary>Creates a new instance of client from given <c>ClientBaseConfiguration</c>.</summary>
-      protected override StatsServiceClient NewInstance(ClientBaseConfiguration configuration)
-      {
-        return new StatsServiceClient(configuration);
-      }
-    }
-
-    /// <summary>Creates service definition that can be registered with a server</summary>
-    /// <param name="serviceImpl">An object implementing the server-side handling logic.</param>
-    public static grpc::ServerServiceDefinition BindService(StatsServiceBase serviceImpl)
-    {
-      return grpc::ServerServiceDefinition.CreateBuilder()
-          .AddMethod(__Method_GetStats, serviceImpl.GetStats).Build();
-    }
-
-  }
-}
-#endregion

v2rayN/v2rayN/v2rayN.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -74,11 +75,32 @@
   <PropertyGroup />
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>.\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.9.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\Google.Protobuf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\Grpc.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Grpc.Core.Api, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\Grpc.Core.Api.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\System.Buffers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -87,15 +109,28 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="zxing">
-      <HintPath>.\zxing.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\System.Memory.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="zxing.presentation">
-      <HintPath>.\zxing.presentation.dll</HintPath>
+    <Reference Include="System.Messaging" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\zxing.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>LIB\zxing.presentation.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -106,6 +141,9 @@
     <Compile Include="Forms\AddServer4Form.Designer.cs">
       <DependentUpon>AddServer4Form.cs</DependentUpon>
     </Compile>
+    <Compile Include="Base\ListViewFlickerFree.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -142,20 +180,29 @@
     <Compile Include="Forms\SubSettingControl.Designer.cs">
       <DependentUpon>SubSettingControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="Handler\V2rayUpdateHandle.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServer.cs" />
-    <Compile Include="HttpProxyHandler\PACFileWatcherHandle.cs" />
+    <Compile Include="Handler\SpeedtestHandler.cs" />
+    <Compile Include="Handler\StatisticsHandler.cs" />
+    <Compile Include="Handler\DownloadHandle.cs" />
+    <Compile Include="Base\HttpWebServer.cs" />
+    <Compile Include="Base\HttpWebServerB.cs" />
     <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
     <Compile Include="HttpProxyHandler\PACListHandle.cs" />
     <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
+    <Compile Include="HttpProxyHandler\ProxySetting.cs" />
     <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
     <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="HttpProxyHandler\WebClientEx.cs">
+    <Compile Include="Base\WebClientEx.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Mode\EMove.cs" />
+    <Compile Include="Mode\ServerStatistics.cs" />
     <Compile Include="Mode\SysproxyConfig.cs" />
     <Compile Include="Mode\EConfigType.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -166,7 +213,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ResUI.resx</DependentUpon>
     </Compile>
-    <Compile Include="StringEx.cs">
+    <Compile Include="Base\StringEx.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Forms\AddServerForm.cs">
@@ -277,17 +324,13 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <EmbeddedResource Include="app.config">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -297,7 +340,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Protobuf Include="Protos\Statistics.proto" />
     <None Include="Resources\abp.js.gz" />
+    <None Include="Resources\grpc_csharp_ext.x64.dll.gz" />
+    <None Include="Resources\grpc_csharp_ext.x86.dll.gz" />
     <None Include="Resources\pac.txt.gz" />
     <None Include="Resources\sysproxy.exe.gz" />
     <None Include="Resources\sysproxy64.exe.gz" />
@@ -318,9 +364,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Sample\SampleClientConfig.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Newtonsoft.Json.dll" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Sample\SampleHttprequest.txt" />
     <EmbeddedResource Include="Sample\SampleHttpresponse.txt" />
@@ -351,7 +394,6 @@
     <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\mgwz.dll.gz" />
     <None Include="Resources\privoxy.exe.gz" />
     <None Include="Resources\restart.png" />
   </ItemGroup>
@@ -370,19 +412,34 @@
     <None Include="Resources\sub.png" />
     <None Include="Resources\checkupdate.png" />
     <None Include="Resources\about.png" />
+    <EmbeddedResource Include="LIB\Google.Protobuf.dll" />
+    <EmbeddedResource Include="LIB\Grpc.Core.Api.dll" />
+    <EmbeddedResource Include="LIB\Grpc.Core.dll" />
+    <EmbeddedResource Include="LIB\Newtonsoft.Json.dll" />
+    <EmbeddedResource Include="LIB\System.Buffers.dll" />
+    <EmbeddedResource Include="LIB\System.Memory.dll" />
+    <EmbeddedResource Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
+    <EmbeddedResource Include="LIB\zxing.dll" />
+    <EmbeddedResource Include="LIB\zxing.presentation.dll" />
+    <EmbeddedResource Include="LIB\netstandard.dll" />
     <Content Include="Resources\help.png" />
+    <None Include="Resources\notify.png" />
     <Content Include="Resources\privoxy_conf.txt" />
-    <EmbeddedResource Include="zxing.presentation.dll" />
-    <EmbeddedResource Include="zxing.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="protos\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets'))" />
+  </Target>
+  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

v2rayN/v2rayN/v2rayN.csproj.user

@@ -14,4 +14,9 @@
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartAction>Project</StartAction>
+    <StartArguments>
+    </StartArguments>
+  </PropertyGroup>
 </Project>