Update AssemblyInfo.cs

fix #2500

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -0,0 +1,58 @@
+name: Bug 报告
+description: 在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: input
+    id: "expectation"
+    attributes:
+      label: "预期情况"
+      description: "描述你认为应该发生什么"
+    validations:
+      required: true
+  - type: textarea
+    id: "describe-the-bug"
+    attributes:
+      label: "实际情况"
+      description: "描述实际发生了什么"
+    validations:
+      required: true
+  - type: textarea
+    id: "reproduction-method"
+    attributes:
+      label: "复现方法"
+      description: "在BUG出现前执行了哪些操作"
+      placeholder: 标序号
+    validations:
+      required: true
+  - type: textarea
+    id: "log"
+    attributes:
+      label: "日志信息"
+      description: "位置在软件当前目录下的guiLogs"
+      placeholder: 在日志开始和结束位置粘贴冒号后的内容：```
+    validations:
+      required: true
+  - type: textarea
+    id: "more"
+    attributes:
+      label: "额外信息"
+      description: "可选"
+    validations:
+      required: false
+  - type: checkboxes
+    id: "latest-version"
+    attributes:
+      label: "我确认已更新至最新版本"
+      description: "否则请更新后尝试"
+      options:
+        - label: 是
+          required: true
+  - type: checkboxes
+    id: "issues"
+    attributes:
+      label: "我确认已查询历史issues"
+      description: "否则请查询后提出"
+      options:
+        - label: 是
+          required: true

.github/ISSUE_TEMPLATE/02_feature_request.yml

@@ -0,0 +1,34 @@
+name: Feature 请求
+description: "为这个项目提出一个建议"
+title: "[Feature request]: "
+labels: ['enhancement']
+body: 
+- type: input
+  id: problem
+  attributes:
+    label: 相关问题
+    description: "清楚而简洁地描述问题是什么。"
+    placeholder: "当我想要……时，软件不能……"
+  validations:
+    required: true
+- type: input
+  id: way-to-solve
+  attributes:
+    label: 描述你希望的解决方案
+    description: "你希望发生什么"
+  validations:
+    required: true
+- type: input
+  id: instead
+  attributes:
+    label: 描述你所考虑的替代方案
+  validations:
+    required: false
+- type: checkboxes
+  id: "issues"
+  attributes:
+    label: "我确认已查询历史issues"
+    description: "否则请查询后提出"
+    options:
+      - label: 是
+        required: true

.github/ISSUE_TEMPLATE/bug---.md

@@ -1,33 +0,0 @@
----
-name: Bug 报告
-about: 在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。
-title: "[BUG]"
-labels: bug
-assignees: ''
-
----
-
-在提出问题前请先自行排除服务器端问题和升级到最新客户端，同时也请通过搜索确认是否有人提出过相同问题。  
-
-### 预期行为
-描述你认为应该发生什么
-
-### 实际行为
-描述实际发生了什么
-
-### 复现方法
-1.
-2.
-3.
-
-### 日志信息,位置在当前目录下的guiLogs
-<details>
-
-```
-在这里粘贴日志
-```
-</details>
-
-### 环境信息(客户端请升级至最新正式版)
-
-### 额外信息（可选）

.github/ISSUE_TEMPLATE/feature---.md

@@ -1,20 +0,0 @@
----
-name: Feature 请求
-about: 为这个项目提出一个建议
-title: "[Feature request]"
-labels: enhancement
-assignees: ''
-
----
-
-**你的功能请求是否与一个问题有关？请描述。**
-清楚而简洁地描述问题是什么。例如。我总是感到沮丧，当 [...]
-
-**描述你希望的解决方案**
-对你希望发生的事情进行清晰、简明的描述。
-
-**描述你所考虑的替代方案**
-对你考虑过的任何替代解决方案或功能进行清晰、简洁的描述。
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

v2rayN/v2rayN/Base/HttpClientHelper.cs

@@ -45,37 +45,23 @@ namespace v2rayN.Base
             {
                 return null;
             }
-            try
-            {
             HttpResponseMessage response = await httpClient.GetAsync(url);
 
             return await response.Content.ReadAsStringAsync();
         }
-            catch
-            {
-            }
-            return null;
-        }
-        public async Task<string> GetAsync(HttpClient client, string url)
+        public async Task<string> GetAsync(HttpClient client, string url, CancellationToken token)
         {
             if (string.IsNullOrEmpty(url))
             {
                 return null;
             }
-            try
+            HttpResponseMessage response = await client.GetAsync(url, token);
+            if (!response.IsSuccessStatusCode)
             {
-                var cts = new CancellationTokenSource();
-                cts.CancelAfter(5000);
-
-                HttpResponseMessage response = await client.GetAsync(url, cts.Token);
+                throw new Exception(string.Format("The request returned with HTTP status code {0}", response.StatusCode));
+            }
             return await response.Content.ReadAsStringAsync();
         }
-            catch (Exception ex)
-            {
-                Utils.SaveLog("GetAsync", ex);
-            }
-            return null;
-        }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
@@ -162,7 +148,7 @@ namespace v2rayN.Base
             }
         }
 
-        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<double> progress, CancellationToken token)
+        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token)
         {
             if (string.IsNullOrEmpty(url))
             {
@@ -176,15 +162,15 @@ namespace v2rayN.Base
                 throw new Exception(string.Format("The request returned with HTTP status code {0}", response.StatusCode));
             }
 
-            var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
-            var canReportProgress = total != -1 && progress != null;
+            //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
+            //var canReportProgress = total != -1 && progress != null;
 
             using (var stream = await response.Content.ReadAsStreamAsync())
             {
                 var totalRead = 0L;
                 var buffer = new byte[1024 * 64];
                 var isMoreToRead = true;
-                var progressPercentage = 0;
+                string progressSpeed = string.Empty;
                 DateTime totalDatetime = DateTime.Now;
 
                 do
@@ -215,14 +201,13 @@ namespace v2rayN.Base
                         // TODO:   
                         totalRead += read;
 
-                        if (canReportProgress)
-                        {
                         TimeSpan ts = (DateTime.Now - totalDatetime);
-                            var speed = totalRead * 1d / ts.TotalMilliseconds / 1000;
-                            var percent = Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                            if (progressPercentage != percent)
+                        var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
+                        if (progress != null)
                         {
-                                progressPercentage = percent;
+                            if (progressSpeed != speed)
+                            {
+                                progressSpeed = speed;
                                 progress.Report(speed);
                             }
                         }

v2rayN/v2rayN/Base/ListViewFlickerFree.cs

@@ -16,37 +16,37 @@ namespace v2rayN.Base
             UpdateStyles();
         }
 
-        public void RegisterDragEvent(Action<int, int> _update)
+        public void RegisterDragEvent(Action<int, int> update)
         {
-            _updateFunc = _update;
-            this.AllowDrop = true;
+            _updateFunc = update;
+            AllowDrop = true;
 
-            this.ItemDrag += new ItemDragEventHandler(this.lv_ItemDrag);
-            this.DragDrop += new DragEventHandler(this.lv_DragDrop);
-            this.DragEnter += new DragEventHandler(this.lv_DragEnter);
-            this.DragOver += new DragEventHandler(this.lv_DragOver);
-            this.DragLeave += new EventHandler(this.lv_DragLeave);
+            ItemDrag += lv_ItemDrag;
+            DragDrop += lv_DragDrop;
+            DragEnter += lv_DragEnter;
+            DragOver += lv_DragOver;
+            DragLeave += lv_DragLeave;
         }
 
         private void lv_DragDrop(object sender, DragEventArgs e)
         {
-            int targetIndex = this.InsertionMark.Index;
+            int targetIndex = InsertionMark.Index;
             if (targetIndex == -1)
             {
                 return;
             }
-            if (this.InsertionMark.AppearsAfterItem)
+            if (InsertionMark.AppearsAfterItem)
             {
                 targetIndex++;
             }
 
 
-            if (this.SelectedIndices.Count <= 0)
+            if (SelectedIndices.Count <= 0)
             {
                 return;
             }
 
-            _updateFunc(this.SelectedIndices[0], targetIndex);
+            _updateFunc(SelectedIndices[0], targetIndex);
 
             //ListViewItem draggedItem = (ListViewItem)e.Data.GetData(typeof(ListViewItem));
             //this.BeginUpdate();
@@ -63,35 +63,35 @@ namespace v2rayN.Base
 
         private void lv_DragLeave(object sender, EventArgs e)
         {
-            this.InsertionMark.Index = -1;
+            InsertionMark.Index = -1;
         }
 
         private void lv_DragOver(object sender, DragEventArgs e)
         {
-            Point targetPoint = this.PointToClient(new Point(e.X, e.Y));
-            int targetIndex = this.InsertionMark.NearestIndex(targetPoint);
+            Point targetPoint = PointToClient(new Point(e.X, e.Y));
+            int targetIndex = InsertionMark.NearestIndex(targetPoint);
 
             if (targetIndex > -1)
             {
-                Rectangle itemBounds = this.GetItemRect(targetIndex);
-                this.EnsureVisible(targetIndex);
+                Rectangle itemBounds = GetItemRect(targetIndex);
+                EnsureVisible(targetIndex);
 
                 if (targetPoint.Y > itemBounds.Top + (itemBounds.Height / 2))
                 {
-                    this.InsertionMark.AppearsAfterItem = true;
+                    InsertionMark.AppearsAfterItem = true;
                 }
                 else
                 {
-                    this.InsertionMark.AppearsAfterItem = false;
+                    InsertionMark.AppearsAfterItem = false;
                 }
             }
-            this.InsertionMark.Index = targetIndex;
+            InsertionMark.Index = targetIndex;
         }
 
         private void lv_ItemDrag(object sender, ItemDragEventArgs e)
         {
-            this.DoDragDrop(e.Item, DragDropEffects.Move);
-            this.InsertionMark.Index = -1;
+            DoDragDrop(e.Item, DragDropEffects.Move);
+            InsertionMark.Index = -1;
         }
     }
 }

v2rayN/v2rayN/Forms/AddServer2Form.Designer.cs

@@ -31,6 +31,9 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServer2Form));
             this.btnClose = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtPreSocksPort = new System.Windows.Forms.TextBox();
             this.btnEdit = new System.Windows.Forms.Button();
             this.cmbCoreType = new System.Windows.Forms.ComboBox();
             this.labCoreType = new System.Windows.Forms.Label();
@@ -49,14 +52,18 @@
             // 
             // 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);
             // 
             // groupBox1
             // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.txtPreSocksPort);
             this.groupBox1.Controls.Add(this.btnEdit);
             this.groupBox1.Controls.Add(this.cmbCoreType);
             this.groupBox1.Controls.Add(this.labCoreType);
@@ -66,10 +73,24 @@
             this.groupBox1.Controls.Add(this.txtRemarks);
             this.groupBox1.Controls.Add(this.label6);
             this.groupBox1.Controls.Add(this.label1);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // txtPreSocksPort
+            // 
+            resources.ApplyResources(this.txtPreSocksPort, "txtPreSocksPort");
+            this.txtPreSocksPort.Name = "txtPreSocksPort";
+            // 
             // btnEdit
             // 
             resources.ApplyResources(this.btnEdit, "btnEdit");
@@ -79,9 +100,9 @@
             // 
             // cmbCoreType
             // 
+            resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
             this.cmbCoreType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbCoreType.FormattingEnabled = true;
-            resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
             this.cmbCoreType.Name = "cmbCoreType";
             // 
             // labCoreType
@@ -123,9 +144,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
@@ -174,5 +195,8 @@
         private System.Windows.Forms.ComboBox cmbCoreType;
         private System.Windows.Forms.Label labCoreType;
         private System.Windows.Forms.Button btnEdit;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtPreSocksPort;
+        private System.Windows.Forms.Label label3;
     }
 }

v2rayN/v2rayN/Forms/AddServer2Form.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
@@ -18,11 +19,15 @@ namespace v2rayN.Forms
 
         private void AddServer2Form_Load(object sender, EventArgs e)
         {
-            cmbCoreType.Items.AddRange(Global.coreTypes.ToArray());
-            cmbCoreType.Items.Add("clash");
-            cmbCoreType.Items.Add("clash_meta"); 
-            cmbCoreType.Items.Add("hysteria");
-            cmbCoreType.Items.Add("naiveproxy");
+            List<string> coreTypes = new List<string>();
+            foreach (ECoreType it in Enum.GetValues(typeof(ECoreType)))
+            {
+                if (it == ECoreType.v2rayN)
+                    continue;
+                coreTypes.Add(it.ToString());
+            }
+
+            cmbCoreType.Items.AddRange(coreTypes.ToArray());
             cmbCoreType.Items.Add(string.Empty);
 
             txtAddress.ReadOnly = true;
@@ -32,8 +37,10 @@ namespace v2rayN.Forms
             }
             else
             {
-                vmessItem = new VmessItem();
-                vmessItem.groupId = groupId;
+                vmessItem = new VmessItem
+                {
+                    groupId = groupId
+                };
                 ClearServer();
             }
         }
@@ -45,15 +52,9 @@ namespace v2rayN.Forms
         {
             txtRemarks.Text = vmessItem.remarks;
             txtAddress.Text = vmessItem.address;
+            txtPreSocksPort.Text = vmessItem.preSocksPort.ToString();
 
-            if (vmessItem.coreType == null)
-            {
-                cmbCoreType.Text = string.Empty;
-            }
-            else
-            {
-                cmbCoreType.Text = vmessItem.coreType.ToString();
-            }
+            cmbCoreType.Text = vmessItem.coreType == null ? string.Empty : vmessItem.coreType.ToString();
         }
 
 
@@ -79,6 +80,8 @@ namespace v2rayN.Forms
                 return;
             }
             vmessItem.remarks = remarks;
+            vmessItem.preSocksPort = Utils.ToInt(txtPreSocksPort.Text);
+
             if (Utils.IsNullOrEmpty(cmbCoreType.Text))
             {
                 vmessItem.coreType = null;
@@ -90,7 +93,7 @@ namespace v2rayN.Forms
 
             if (ConfigHandler.EditCustomServer(ref config, vmessItem) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -100,14 +103,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            if (Utils.IsNullOrEmpty(vmessItem.indexId))
-            {
-                this.DialogResult = DialogResult.Cancel;
-            }
-            else
-            {
-                this.DialogResult = DialogResult.OK;
-            }
+            DialogResult = Utils.IsNullOrEmpty(vmessItem.indexId) ? DialogResult.Cancel : DialogResult.OK;
         }
 
         private void btnBrowse_Click(object sender, EventArgs e)
@@ -152,7 +148,7 @@ namespace v2rayN.Forms
                 return;
             }
 
-            address = Path.Combine(Utils.GetConfigPath(), address);
+            address = Utils.GetConfigPath(address);
             Process.Start(address);
         }
     }

v2rayN/v2rayN/Forms/AddServer2Form.resx

@@ -118,390 +118,456 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>370, 41</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="labCoreType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 12</value>
+  </data>
+  <data name="&gt;&gt;cmbCoreType.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>* After setting this value, an socks service will be started using V2ray to provide functions such as speed display</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;labCoreType.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="labCoreType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>groupBox1</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="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="cmbCoreType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 157</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 62</value>
+  </data>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="labCoreType.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Custom configuration server</value>
+  </data>
+  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 110</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>357, 17</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="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>46</value>
+  </data>
+  <data name="&gt;&gt;btnBrowse.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.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>432, 37</value>
+  </data>
+  <data name="&gt;&gt;labCoreType.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;txtPreSocksPort.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
     <value>450, 17</value>
   </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtPreSocksPort.Name" xml:space="preserve">
+    <value>txtPreSocksPort</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 60</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="txtPreSocksPort.TabIndex" type="System.Int32, mscorlib">
+    <value>45</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="btnOK.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="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>208, 110</value>
   </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
+  <data name="btnEdit.Text" xml:space="preserve">
+    <value>&amp;Edit</value>
   </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>313, 21</value>
+  </data>
+  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="btnBrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="cmbCoreType.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>AddServer2Form</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>446, 26</value>
+  </data>
+  <data name="&gt;&gt;btnBrowse.Parent" xml:space="preserve">
+    <value>groupBox1</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;labCoreType.Name" xml:space="preserve">
+    <value>labCoreType</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</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.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="cmbCoreType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 20</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="labCoreType.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.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 name="txtPreSocksPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 21</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnEdit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 10</value>
   </data>
-  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>208, 110</value>
-  </data>
-  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
-    <value>43</value>
-  </data>
-  <data name="btnEdit.Text" xml:space="preserve">
-    <value>&amp;Edit</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
-    <value>btnEdit</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.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;btnEdit.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="cmbCoreType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 157</value>
-  </data>
-  <data name="cmbCoreType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 20</value>
-  </data>
-  <data name="cmbCoreType.TabIndex" type="System.Int32, mscorlib">
-    <value>41</value>
-  </data>
-  <data name="&gt;&gt;cmbCoreType.Name" xml:space="preserve">
-    <value>cmbCoreType</value>
-  </data>
-  <data name="&gt;&gt;cmbCoreType.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbCoreType.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;cmbCoreType.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="labCoreType.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labCoreType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labCoreType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 161</value>
-  </data>
-  <data name="labCoreType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="labCoreType.TabIndex" type="System.Int32, mscorlib">
-    <value>42</value>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 10</value>
   </data>
   <data name="labCoreType.Text" xml:space="preserve">
     <value>Core Type</value>
   </data>
-  <data name="&gt;&gt;labCoreType.Name" xml:space="preserve">
-    <value>labCoreType</value>
+  <data name="txtPreSocksPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 195</value>
   </data>
-  <data name="&gt;&gt;labCoreType.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;labCoreType.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;labCoreType.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="btnBrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 110</value>
-  </data>
-  <data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="btnBrowse.TabIndex" type="System.Int32, mscorlib">
-    <value>40</value>
-  </data>
-  <data name="btnBrowse.Text" xml:space="preserve">
-    <value>&amp;Browse</value>
-  </data>
-  <data name="&gt;&gt;btnBrowse.Name" xml:space="preserve">
-    <value>btnBrowse</value>
-  </data>
-  <data name="&gt;&gt;btnBrowse.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;btnBrowse.Parent" xml:space="preserve">
+  <data name="&gt;&gt;cmbCoreType.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;btnBrowse.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 62</value>
-  </data>
-  <data name="txtAddress.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>432, 37</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>23</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>4</value>
-  </data>
-  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>446, 26</value>
-  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <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>5</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 23</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>313, 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>
-  <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;txtRemarks.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
+    <value>btnEdit</value>
   </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 27</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
   </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
   </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <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>7</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, 62</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 12</value>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Address</value>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>229, 189</value>
   </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
   </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+  <data name="txtAddress.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="labCoreType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 161</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="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>23</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="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;cmbCoreType.Name" xml:space="preserve">
+    <value>cmbCoreType</value>
+  </data>
+  <data name="btnBrowse.Text" xml:space="preserve">
+    <value>&amp;Browse</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;label1.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>8</value>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 10</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 189</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="&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, 199</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 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 name="label2.Text" xml:space="preserve">
+    <value>Pre-Socks Port</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="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>357, 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="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, 0</value>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 259</value>
   </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>611, 10</value>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+  <data name="btnEdit.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
+  <data name="&gt;&gt;labCoreType.Parent" xml:space="preserve">
+    <value>groupBox1</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="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>47, 12</value>
   </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="&gt;&gt;txtPreSocksPort.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.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Address</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 23</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</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;cmbCoreType.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;txtPreSocksPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 199</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>611, 319</value>
+  </data>
+  <data name="&gt;&gt;btnBrowse.Name" xml:space="preserve">
+    <value>btnBrowse</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>611, 249</value>
+  </data>
+  <data name="btnBrowse.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</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="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
+    <value>txtRemarks</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 27</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</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>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</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>611, 259</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Custom configuration server</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer2Form</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
 </root>

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

@@ -117,34 +117,56 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="$this.Text" xml:space="preserve">
-    <value>自定义配置</value>
-  </data>
-  <data name="btnBrowse.Text" xml:space="preserve">
-    <value>浏览(&amp;B)</value>
-  </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="btnEdit.Text" xml:space="preserve">
-    <value>编辑(&amp;E)</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
   <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="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>337, 41</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用V2ray-core额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Socks端口</value>
+  </data>
+  <data name="btnEdit.Text" xml:space="preserve">
+    <value>编辑(&amp;E)</value>
+  </data>
+  <data name="labCoreType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
   <data name="labCoreType.Text" xml:space="preserve">
     <value>Core类型</value>
   </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>地址(address)</value>
+  <data name="btnBrowse.Text" xml:space="preserve">
+    <value>浏览(&amp;B)</value>
   </data>
   <data name="label13.Text" xml:space="preserve">
     <value>*手填,方便识别管理</value>
   </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
   <data name="label6.Text" xml:space="preserve">
     <value>别名(remarks)</value>
   </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>自定义配置</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/AddServerForm.cs

@@ -16,14 +16,14 @@ namespace v2rayN.Forms
 
         private void AddServerForm_Load(object sender, EventArgs e)
         {
-            this.Text = (eConfigType).ToString();
+            Text = (eConfigType).ToString();
             
             cmbCoreType.Items.AddRange(Global.coreTypes.ToArray());
             cmbCoreType.Items.Add(string.Empty);
 
             switch (eConfigType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                     panVmess.Dock = DockStyle.Fill;
                     panVmess.Visible = true;
 
@@ -32,8 +32,8 @@ namespace v2rayN.Forms
                 case EConfigType.Shadowsocks:
                     panSs.Dock = DockStyle.Fill;
                     panSs.Visible = true;
-                    panTran.Visible = false;
-                    this.Height = this.Height - panTran.Height;
+                    //panTran.Visible = false;
+                    //this.Height = this.Height - panTran.Height;
 
                     cmbSecurity3.Items.AddRange(LazyConfig.Instance.GetShadowsocksSecuritys().ToArray());
                     break;
@@ -41,7 +41,7 @@ namespace v2rayN.Forms
                     panSocks.Dock = DockStyle.Fill;
                     panSocks.Visible = true;
                     panTran.Visible = false;
-                    this.Height = this.Height - panTran.Height;
+                    Height = Height - panTran.Height;
                     break;
                 case EConfigType.VLESS:
                     panVless.Dock = DockStyle.Fill;
@@ -65,8 +65,10 @@ namespace v2rayN.Forms
             }
             else
             {
-                vmessItem = new VmessItem();
-                vmessItem.groupId = groupId;
+                vmessItem = new VmessItem
+                {
+                    groupId = groupId
+                };
                 ClearServer();
             }
         }
@@ -82,7 +84,7 @@ namespace v2rayN.Forms
 
             switch (eConfigType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                     txtId.Text = vmessItem.id;
                     txtAlterId.Text = vmessItem.alterId.ToString();
                     cmbSecurity.Text = vmessItem.security;
@@ -106,14 +108,7 @@ namespace v2rayN.Forms
                     break;
             }
 
-            if (vmessItem.coreType == null)
-            {
-                cmbCoreType.Text = string.Empty;
-            }
-            else
-            {
-                cmbCoreType.Text = vmessItem.coreType.ToString();
-            }
+            cmbCoreType.Text = vmessItem.coreType == null ? string.Empty : vmessItem.coreType.ToString();
 
             transportControl.BindingServer(vmessItem);
         }
@@ -129,7 +124,7 @@ namespace v2rayN.Forms
 
             switch (eConfigType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                     txtId.Text = "";
                     txtAlterId.Text = "0";
                     cmbSecurity.Text = Global.DefaultSecurity;
@@ -169,7 +164,7 @@ namespace v2rayN.Forms
 
             switch (eConfigType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                     id = txtId.Text;
                     alterId = txtAlterId.Text;
                     security = cmbSecurity.Text;
@@ -246,7 +241,7 @@ namespace v2rayN.Forms
             int ret = -1;
             switch (eConfigType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                     ret = ConfigHandler.AddServer(ref config, vmessItem);
                     break;
                 case EConfigType.Shadowsocks:
@@ -267,7 +262,7 @@ namespace v2rayN.Forms
 
             if (ret == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -284,7 +279,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
     }
 }

v2rayN/v2rayN/Forms/BaseForm.cs

@@ -7,7 +7,6 @@ namespace v2rayN.Forms
     public partial class BaseForm : Form
     {
         protected static Config config;
-        protected static System.Drawing.Icon icon;
 
         public BaseForm()
         {
@@ -18,17 +17,15 @@ namespace v2rayN.Forms
         private void LoadCustomIcon()
         {
             try
-            {
-                if (icon == null)
             {
                 string file = Utils.GetPath(Global.CustomIconName);
-                    if (!System.IO.File.Exists(file))
+                if (System.IO.File.Exists(file))
                 {
+                    Icon = new System.Drawing.Icon(file);
                     return;
                 }
-                    icon = new System.Drawing.Icon(file);
-                }
-                this.Icon = icon;
+
+                Icon = Properties.Resources.NotifyIcon1;
             }
             catch (Exception e)
             {

v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs

@@ -101,7 +101,7 @@ namespace v2rayN.Forms
 
             if (ConfigHandler.SaveConfig(ref config, false) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -111,7 +111,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
 
         private void btnReset_Click(object sender, EventArgs e)

v2rayN/v2rayN/Forms/GroupSettingControl.cs

@@ -23,7 +23,7 @@ namespace v2rayN.Forms
 
         private void GroupSettingControl_Load(object sender, EventArgs e)
         {
-            this.Height = grbMain.Height;
+            Height = grbMain.Height;
             BindingSub();
         }
 

v2rayN/v2rayN/Forms/GroupSettingForm.cs

@@ -70,7 +70,7 @@ namespace v2rayN.Forms
         {            
             if (ConfigHandler.SaveGroupItem(ref config) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -80,7 +80,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
 
         private void btnAdd_Click(object sender, EventArgs e)

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            this.scMain = new System.Windows.Forms.SplitContainer();
+            this.scServers = new System.Windows.Forms.SplitContainer();
             this.lvServers = new v2rayN.Base.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -46,8 +46,10 @@
             this.menuRemoveDuplicateServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuCopyServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSetDefaultServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuServerFilter = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.menuMoveToGroup = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuMoveEvent = new System.Windows.Forms.ToolStripMenuItem();
             this.menuMoveTop = new System.Windows.Forms.ToolStripMenuItem();
             this.menuMoveUp = new System.Windows.Forms.ToolStripMenuItem();
             this.menuMoveDown = new System.Windows.Forms.ToolStripMenuItem();
@@ -58,6 +60,7 @@
             this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuRealPingServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSpeedServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuSortServerResult = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbTestMe = new System.Windows.Forms.ToolStripMenuItem();
             this.menuClearServerStatistics = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
@@ -68,8 +71,8 @@
             this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             this.tabGroup = new System.Windows.Forms.TabControl();
             this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
-            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.scBig = new System.Windows.Forms.SplitContainer();
+            this.gbServers = new System.Windows.Forms.GroupBox();
             this.mainMsgControl = new v2rayN.Forms.MainMsgControl();
             this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
             this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -109,6 +112,9 @@
             this.tsbCheckUpdateN = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbCheckUpdateCore = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbCheckUpdateXrayCore = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbCheckUpdateClashCore = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbCheckUpdateClashMetaCore = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbCheckUpdateGeo = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
@@ -121,35 +127,35 @@
             this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbClose = new System.Windows.Forms.ToolStripButton();
-            ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
-            this.scMain.Panel1.SuspendLayout();
-            this.scMain.Panel2.SuspendLayout();
-            this.scMain.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.scServers)).BeginInit();
+            this.scServers.Panel1.SuspendLayout();
+            this.scServers.Panel2.SuspendLayout();
+            this.scServers.SuspendLayout();
             this.cmsLv.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-            this.splitContainer1.Panel1.SuspendLayout();
-            this.splitContainer1.Panel2.SuspendLayout();
-            this.splitContainer1.SuspendLayout();
-            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.scBig)).BeginInit();
+            this.scBig.Panel1.SuspendLayout();
+            this.scBig.Panel2.SuspendLayout();
+            this.scBig.SuspendLayout();
+            this.gbServers.SuspendLayout();
             this.cmsMain.SuspendLayout();
             this.tsMain.SuspendLayout();
             this.SuspendLayout();
             // 
-            // scMain
+            // scServers
             // 
-            resources.ApplyResources(this.scMain, "scMain");
-            this.scMain.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.scMain.Name = "scMain";
+            resources.ApplyResources(this.scServers, "scServers");
+            this.scServers.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.scServers.Name = "scServers";
             // 
-            // scMain.Panel1
+            // scServers.Panel1
             // 
-            this.scMain.Panel1.Controls.Add(this.lvServers);
-            this.scMain.Panel1.Controls.Add(this.tabGroup);
+            this.scServers.Panel1.Controls.Add(this.lvServers);
+            this.scServers.Panel1.Controls.Add(this.tabGroup);
             // 
-            // scMain.Panel2
+            // scServers.Panel2
             // 
-            this.scMain.Panel2.Controls.Add(this.qrCodeControl);
-            this.scMain.TabStop = false;
+            this.scServers.Panel2.Controls.Add(this.qrCodeControl);
+            this.scServers.TabStop = false;
             // 
             // lvServers
             // 
@@ -188,18 +194,17 @@
             this.menuRemoveDuplicateServer,
             this.menuCopyServer,
             this.menuSetDefaultServer,
+            this.menuServerFilter,
             this.toolStripSeparator3,
             this.menuMoveToGroup,
-            this.menuMoveTop,
-            this.menuMoveUp,
-            this.menuMoveDown,
-            this.menuMoveBottom,
+            this.menuMoveEvent,
             this.menuSelectAll,
             this.toolStripSeparator9,
             this.menuPingServer,
             this.menuTcpingServer,
             this.menuRealPingServer,
             this.menuSpeedServer,
+            this.menuSortServerResult,
             this.tsbTestMe,
             this.menuClearServerStatistics,
             this.toolStripSeparator6,
@@ -208,6 +213,7 @@
             this.menuExport2ShareUrl,
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.tsbServer;
             resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAddVmessServer
@@ -287,6 +293,12 @@
             resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
             this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
             // 
+            // menuServerFilter
+            // 
+            this.menuServerFilter.Name = "menuServerFilter";
+            resources.ApplyResources(this.menuServerFilter, "menuServerFilter");
+            this.menuServerFilter.Click += new System.EventHandler(this.menuServerFilter_Click);
+            // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -298,6 +310,16 @@
             resources.ApplyResources(this.menuMoveToGroup, "menuMoveToGroup");
             this.menuMoveToGroup.Click += new System.EventHandler(this.menuMoveToGroup_Click);
             // 
+            // menuMoveEvent
+            // 
+            this.menuMoveEvent.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuMoveTop,
+            this.menuMoveUp,
+            this.menuMoveDown,
+            this.menuMoveBottom});
+            this.menuMoveEvent.Name = "menuMoveEvent";
+            resources.ApplyResources(this.menuMoveEvent, "menuMoveEvent");
+            // 
             // menuMoveTop
             // 
             this.menuMoveTop.Name = "menuMoveTop";
@@ -357,6 +379,12 @@
             resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
             this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
             // 
+            // menuSortServerResult
+            // 
+            this.menuSortServerResult.Name = "menuSortServerResult";
+            resources.ApplyResources(this.menuSortServerResult, "menuSortServerResult");
+            this.menuSortServerResult.Click += new System.EventHandler(this.menuSortServerResult_Click);
+            // 
             // tsbTestMe
             // 
             this.tsbTestMe.Name = "tsbTestMe";
@@ -417,25 +445,25 @@
             resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
             this.qrCodeControl.Name = "qrCodeControl";
             // 
-            // splitContainer1
+            // scBig
             // 
-            resources.ApplyResources(this.splitContainer1, "splitContainer1");
-            this.splitContainer1.Name = "splitContainer1";
+            resources.ApplyResources(this.scBig, "scBig");
+            this.scBig.Name = "scBig";
             // 
-            // splitContainer1.Panel1
+            // scBig.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
+            this.scBig.Panel1.Controls.Add(this.gbServers);
             // 
-            // splitContainer1.Panel2
+            // scBig.Panel2
             // 
-            this.splitContainer1.Panel2.Controls.Add(this.mainMsgControl);
+            this.scBig.Panel2.Controls.Add(this.mainMsgControl);
             // 
-            // groupBox1
+            // gbServers
             // 
-            this.groupBox1.Controls.Add(this.scMain);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.TabStop = false;
+            this.gbServers.Controls.Add(this.scServers);
+            resources.ApplyResources(this.gbServers, "gbServers");
+            this.gbServers.Name = "gbServers";
+            this.gbServers.TabStop = false;
             // 
             // mainMsgControl
             // 
@@ -691,6 +719,9 @@
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
             this.tsbCheckUpdateXrayCore,
+            this.toolStripSeparator16,
+            this.tsbCheckUpdateClashCore,
+            this.tsbCheckUpdateClashMetaCore,
             this.toolStripSeparator15,
             this.tsbCheckUpdateGeo});
             this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
@@ -715,6 +746,23 @@
             resources.ApplyResources(this.tsbCheckUpdateXrayCore, "tsbCheckUpdateXrayCore");
             this.tsbCheckUpdateXrayCore.Click += new System.EventHandler(this.tsbCheckUpdateXrayCore_Click);
             // 
+            // toolStripSeparator16
+            // 
+            this.toolStripSeparator16.Name = "toolStripSeparator16";
+            resources.ApplyResources(this.toolStripSeparator16, "toolStripSeparator16");
+            // 
+            // tsbCheckUpdateClashCore
+            // 
+            this.tsbCheckUpdateClashCore.Name = "tsbCheckUpdateClashCore";
+            resources.ApplyResources(this.tsbCheckUpdateClashCore, "tsbCheckUpdateClashCore");
+            this.tsbCheckUpdateClashCore.Click += new System.EventHandler(this.tsbCheckUpdateClashCore_Click);
+            // 
+            // tsbCheckUpdateClashMetaCore
+            // 
+            this.tsbCheckUpdateClashMetaCore.Name = "tsbCheckUpdateClashMetaCore";
+            resources.ApplyResources(this.tsbCheckUpdateClashMetaCore, "tsbCheckUpdateClashMetaCore");
+            this.tsbCheckUpdateClashMetaCore.Click += new System.EventHandler(this.tsbCheckUpdateClashMetaCore_Click);
+            // 
             // toolStripSeparator15
             // 
             this.toolStripSeparator15.Name = "toolStripSeparator15";
@@ -796,7 +844,7 @@
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.splitContainer1);
+            this.Controls.Add(this.scBig);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.tsMain);
             this.MaximizeBox = true;
@@ -807,16 +855,16 @@
             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.scMain.Panel1.ResumeLayout(false);
-            this.scMain.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
-            this.scMain.ResumeLayout(false);
+            this.scServers.Panel1.ResumeLayout(false);
+            this.scServers.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.scServers)).EndInit();
+            this.scServers.ResumeLayout(false);
             this.cmsLv.ResumeLayout(false);
-            this.splitContainer1.Panel1.ResumeLayout(false);
-            this.splitContainer1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-            this.splitContainer1.ResumeLayout(false);
-            this.groupBox1.ResumeLayout(false);
+            this.scBig.Panel1.ResumeLayout(false);
+            this.scBig.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.scBig)).EndInit();
+            this.scBig.ResumeLayout(false);
+            this.gbServers.ResumeLayout(false);
             this.cmsMain.ResumeLayout(false);
             this.tsMain.ResumeLayout(false);
             this.tsMain.PerformLayout();
@@ -827,7 +875,7 @@
 
 #endregion
 
-        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.GroupBox gbServers;
         private v2rayN.Base.ListViewFlickerFree lvServers;
         private System.Windows.Forms.NotifyIcon notifyMain;
         private System.Windows.Forms.ContextMenuStrip cmsMain;
@@ -851,10 +899,6 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
-        private System.Windows.Forms.ToolStripMenuItem menuMoveTop;
-        private System.Windows.Forms.ToolStripMenuItem menuMoveUp;
-        private System.Windows.Forms.ToolStripMenuItem menuMoveDown;
-        private System.Windows.Forms.ToolStripMenuItem menuMoveBottom;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
         private System.Windows.Forms.ToolStripMenuItem menuSysAgentMode;
         private System.Windows.Forms.ToolStripMenuItem menuGlobal;
@@ -862,7 +906,7 @@
         private System.Windows.Forms.ToolStripMenuItem menuAddCustomServer;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripMenuItem menuAddShadowsocksServer;
-        private System.Windows.Forms.SplitContainer scMain;
+        private System.Windows.Forms.SplitContainer scServers;
         private QRCodeControl qrCodeControl;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
         private System.Windows.Forms.ToolStripDropDownButton tsbCheckUpdate;
@@ -910,7 +954,7 @@
         private System.Windows.Forms.ToolStripMenuItem tsbBackupGuiNConfig;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
         private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateGeo;
-        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.SplitContainer scBig;
         private System.Windows.Forms.ToolStripMenuItem tsbSubUpdateViaProxy;
         private System.Windows.Forms.ToolStripMenuItem menuUpdateSubViaProxy;
         private System.Windows.Forms.ToolStripMenuItem tsbGlobalHotkeySetting;
@@ -918,6 +962,16 @@
         private System.Windows.Forms.ToolStripMenuItem tsbGroupSetting;
         private System.Windows.Forms.ToolStripMenuItem menuMoveToGroup;
         private MainMsgControl mainMsgControl;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveEvent;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveTop;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveUp;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveDown;
+        private System.Windows.Forms.ToolStripMenuItem menuMoveBottom;
+        private System.Windows.Forms.ToolStripMenuItem menuServerFilter;
+        private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateClashCore;
+        private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateClashMetaCore;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
+        private System.Windows.Forms.ToolStripMenuItem menuSortServerResult;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -18,19 +18,20 @@ namespace v2rayN.Forms
     {
         private V2rayHandler v2rayHandler;
         private List<VmessItem> lstSelecteds = new List<VmessItem>();
-        private StatisticsHandler statistics = null;
-        private List<VmessItem> lstVmess = null;
+        private StatisticsHandler statistics;
+        private List<VmessItem> lstVmess;
         private string groupId = string.Empty;
+        private string serverFilter = string.Empty;
 
         #region Window 事件
 
         public MainForm()
         {
             InitializeComponent();
-            this.ShowInTaskbar = false;
-            this.WindowState = FormWindowState.Minimized;
+            ShowInTaskbar = false;
+            WindowState = FormWindowState.Minimized;
             HideForm();
-            this.Text = Utils.GetVersion();
+            Text = Utils.GetVersion();
             Global.processJob = new Job();
 
             Application.ApplicationExit += (sender, args) =>
@@ -123,7 +124,10 @@ namespace v2rayN.Forms
         {
             try
             {
-                v2rayHandler.V2rayStop();
+                Utils.SaveLog("MyAppExit Begin");
+
+                StorageUI();
+                ConfigHandler.SaveConfig(ref config);
 
                 //HttpProxyHandle.CloseHttpAgent(config);
                 if (blWindowsShutDown)
@@ -135,26 +139,27 @@ namespace v2rayN.Forms
                     SysProxyHandle.UpdateSysProxy(config, true);
                 }
 
-                StorageUI();
-                ConfigHandler.SaveConfig(ref config);
                 statistics?.SaveToFile();
                 statistics?.Close();
+
+                v2rayHandler.V2rayStop();
+                Utils.SaveLog("MyAppExit End");
             }
             catch { }
         }
 
         private void RestoreUI()
         {
-            scMain.Panel2Collapsed = true;
+            scServers.Panel2Collapsed = true;
 
             if (!config.uiItem.mainLocation.IsEmpty)
             {
-                this.Location = config.uiItem.mainLocation;
+                Location = config.uiItem.mainLocation;
             }
             if (!config.uiItem.mainSize.IsEmpty)
             {
-                this.Width = config.uiItem.mainSize.Width;
-                this.Height = config.uiItem.mainSize.Height;
+                Width = config.uiItem.mainSize.Width;
+                Height = config.uiItem.mainSize.Height;
             }
 
 
@@ -167,9 +172,9 @@ namespace v2rayN.Forms
 
         private void StorageUI()
         {
-            config.uiItem.mainLocation = this.Location;
+            config.uiItem.mainLocation = Location;
 
-            config.uiItem.mainSize = new Size(this.Width, this.Height);
+            config.uiItem.mainSize = new Size(Width, Height);
 
             for (int k = 0; k < lvServers.Columns.Count; k++)
             {
@@ -182,7 +187,7 @@ namespace v2rayN.Forms
             switch (Utils.ToInt(e.Name))
             {
                 case (int)EGlobalHotkey.ShowForm:
-                    if (this.ShowInTaskbar) HideForm(); else ShowForm();
+                    if (ShowInTaskbar) HideForm(); else ShowForm();
                     break;
                 case (int)EGlobalHotkey.SystemProxyClear:
                     SetListenerType(ESysProxyType.ForcedClear);
@@ -207,7 +212,8 @@ namespace v2rayN.Forms
         private void RefreshServers()
         {
             lstVmess = config.vmess
-                .Where(it => Utils.IsNullOrEmpty(groupId) ? true : it.groupId == groupId)
+                .Where(it => Utils.IsNullOrEmpty(groupId) || it.groupId == groupId)
+                .Where(it => Utils.IsNullOrEmpty(serverFilter) || it.remarks.Contains(serverFilter))
                 .OrderBy(it => it.sort)
                 .ToList();
 
@@ -365,7 +371,7 @@ namespace v2rayN.Forms
                 {
                     ts.Checked = true;
                 }
-                ts.Click += new EventHandler(ts_Click);
+                ts.Click += ts_Click;
                 lst.Add(ts);
             }
             menuServers.DropDownItems.AddRange(lst.ToArray());
@@ -409,7 +415,7 @@ namespace v2rayN.Forms
                 }
 
                 var tag = lvServers.Columns[e.Column].Tag?.ToString();
-                bool asc = Utils.IsNullOrEmpty(tag) ? true : !Convert.ToBoolean(tag);
+                bool asc = Utils.IsNullOrEmpty(tag) || !Convert.ToBoolean(tag);
                 if (ConfigHandler.SortServers(ref config, ref lstVmess, (EServerColName)e.Column, asc) != 0)
                 {
                     return;
@@ -459,7 +465,7 @@ namespace v2rayN.Forms
                 {
                     Tag = item.id,
                 };
-                ts.Click += new EventHandler(ts_Group_Click);
+                ts.Click += ts_Group_Click;
                 lst.Add(ts);
             }
             menuMoveToGroup.DropDownItems.AddRange(lst.ToArray());
@@ -510,7 +516,7 @@ namespace v2rayN.Forms
         /// </summary>
         async Task LoadV2ray()
         {
-            this.BeginInvoke(new Action(() =>
+            BeginInvoke(new Action(() =>
             {
                 tsbReload.Enabled = false;
             }));
@@ -530,7 +536,7 @@ namespace v2rayN.Forms
 
             ChangePACButtonStatus(config.sysProxyType);
 
-            this.BeginInvoke(new Action(() =>
+            BeginInvoke(new Action(() =>
             {
                 tsbReload.Enabled = true;
             }));
@@ -624,6 +630,12 @@ namespace v2rayN.Forms
                     case Keys.T:
                         menuSpeedServer_Click(null, null);
                         break;
+                    case Keys.F:
+                        menuServerFilter_Click(null, null);
+                        break;
+                    case Keys.E:
+                        menuSortServerResult_Click(null, null);
+                        break;
                 }
             }
             else
@@ -654,7 +666,7 @@ namespace v2rayN.Forms
 
         private void menuAddVmessServer_Click(object sender, EventArgs e)
         {
-            ShowServerForm(EConfigType.Vmess, -1);
+            ShowServerForm(EConfigType.VMess, -1);
         }
 
         private void menuAddVlessServer_Click(object sender, EventArgs e)
@@ -713,6 +725,17 @@ namespace v2rayN.Forms
             SetDefaultServer(index);
         }
 
+        private void menuServerFilter_Click(object sender, EventArgs e)
+        {
+            var fm = new MsgFilterSetForm();
+            fm.MsgFilter = serverFilter;
+            if (fm.ShowDialog() == DialogResult.OK)
+            {
+                serverFilter = fm.MsgFilter;
+                gbServers.Text = string.Format(ResUI.MsgServerTitle, serverFilter);
+                RefreshServers();
+            }
+        }
 
         private void menuPingServer_Click(object sender, EventArgs e)
         {
@@ -754,6 +777,10 @@ namespace v2rayN.Forms
             ClearTestResult();
             SpeedtestHandler statistics = new SpeedtestHandler(config, v2rayHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
         }
+        private void menuSortServerResult_Click(object sender, EventArgs e)
+        {
+            lvServers_ColumnClick(null, new ColumnClickEventArgs((int)EServerColName.testResult));
+        }
 
         private void tsbTestMe_Click(object sender, EventArgs e)
         {
@@ -772,12 +799,20 @@ namespace v2rayN.Forms
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
         {
             int index = GetLvSelectedIndex();
+            if (index < 0)
+            {
+                return;
+            }
             MainFormHandler.Instance.Export2ClientConfig(lstVmess[index], config);
         }
 
         private void menuExport2ServerConfig_Click(object sender, EventArgs e)
         {
             int index = GetLvSelectedIndex();
+            if (index < 0)
+            {
+                return;
+            }
             MainFormHandler.Instance.Export2ServerConfig(lstVmess[index], config);
         }
 
@@ -897,7 +932,23 @@ namespace v2rayN.Forms
             }
             if (ConfigHandler.SetDefaultServer(ref config, lstVmess[index]) == 0)
             {
-                RefreshServers();
+                //RefreshServers();
+                for (int k = 0; k < lstVmess.Count; k++)
+                {
+                    if (config.IsActiveNode(lstVmess[k]))
+                    {
+                        lvServers.Items[k].SubItems[0].Text = "√";
+                        lvServers.Items[k].ForeColor = Color.DodgerBlue;
+                        lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Bold);
+                    }
+                    else
+                    {
+                        lvServers.Items[k].SubItems[0].Text = "";
+                        lvServers.Items[k].ForeColor = lvServers.ForeColor;
+                        lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Regular);
+                    }
+                }
+                RefreshServersMenu();
                 _ = LoadV2ray();
             }
             return 0;
@@ -1047,7 +1098,7 @@ namespace v2rayN.Forms
         /// <param name="msg"></param>
         private void notifyMsg(string msg)
         {
-            notifyMain.Text = msg;
+            notifyMain.Text = (msg.Length <= 63 ? msg : msg.Substring(1, 63));
         }
 
         #endregion
@@ -1065,8 +1116,8 @@ namespace v2rayN.Forms
 
         private void menuExit_Click(object sender, EventArgs e)
         {
-            this.Visible = false;
-            this.Close();
+            Visible = false;
+            Close();
 
             Application.Exit();
         }
@@ -1074,13 +1125,13 @@ namespace v2rayN.Forms
 
         private void ShowForm()
         {
-            this.Show();
-            if (this.WindowState == FormWindowState.Minimized)
+            Show();
+            if (WindowState == FormWindowState.Minimized)
             {
-                this.WindowState = FormWindowState.Normal;
+                WindowState = FormWindowState.Normal;
             }
-            this.Activate();
-            this.ShowInTaskbar = true;
+            Activate();
+            ShowInTaskbar = true;
             //this.notifyIcon1.Visible = false;
             mainMsgControl.ScrollToCaret();
 
@@ -1097,12 +1148,18 @@ namespace v2rayN.Forms
         private void HideForm()
         {
             //this.WindowState = FormWindowState.Minimized;
-            this.Hide();
+            Hide();
             //this.notifyMain.Icon = this.Icon;
-            this.notifyMain.Visible = true;
-            this.ShowInTaskbar = false;
+            notifyMain.Visible = true;
+            ShowInTaskbar = false;
 
             SetVisibleCore(false);
+
+            //write Handle to reg
+            if (IsHandleCreated)
+            {
+                Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)Handle));
+            }
         }
 
         #endregion
@@ -1148,8 +1205,8 @@ namespace v2rayN.Forms
         {
             try
             {
-                up /= (ulong)(config.statisticsFreshRate / 1000f);
-                down /= (ulong)(config.statisticsFreshRate / 1000f);
+                up /= (ulong)(config.statisticsFreshRate);
+                down /= (ulong)(config.statisticsFreshRate);
                 mainMsgControl.SetToolSslInfo("speed", string.Format("{0}/s↑ | {1}/s↓", Utils.HumanFy(up), Utils.HumanFy(down)));
 
                 foreach (var it in statistics)
@@ -1217,7 +1274,6 @@ namespace v2rayN.Forms
             int index = GetLvSelectedIndex();
             if (index < 0)
             {
-                UI.Show(ResUI.PleaseSelectServer);
                 return;
             }
             if (ConfigHandler.MoveServer(ref config, ref lstVmess, index, eMove) == 0)
@@ -1273,7 +1329,10 @@ namespace v2rayN.Forms
 
             mainMsgControl.DisplayToolStatus(config);
 
-            notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
+            BeginInvoke(new Action(() =>
+            {
+                notifyMain.Icon = Icon = MainFormHandler.Instance.GetNotifyIcon(config, Icon);
+            }));
         }
 
         #endregion
@@ -1291,10 +1350,7 @@ namespace v2rayN.Forms
                     menuExit_Click(null, null);
                 }
             };
-            Task.Run(() =>
-            {
             (new UpdateHandle()).CheckUpdateGuiN(config, _updateUI);
-            });
         }
 
         private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
@@ -1307,6 +1363,16 @@ namespace v2rayN.Forms
             CheckUpdateCore(ECoreType.Xray);
         }
 
+        private void tsbCheckUpdateClashCore_Click(object sender, EventArgs e)
+        {
+            CheckUpdateCore(ECoreType.clash);
+        }
+
+        private void tsbCheckUpdateClashMetaCore_Click(object sender, EventArgs e)
+        {
+            CheckUpdateCore(ECoreType.clash_meta);
+        }
+
         private void CheckUpdateCore(ECoreType type)
         {
             void _updateUI(bool success, string msg)
@@ -1327,10 +1393,7 @@ namespace v2rayN.Forms
                     AppendText(false, ResUI.MsgUpdateV2rayCoreSuccessfully);
                 }
             };
-            Task.Run(() =>
-            {
             (new UpdateHandle()).CheckUpdateCore(type, config, _updateUI);
-            });
         }
 
         private void tsbCheckUpdateGeo_Click(object sender, EventArgs e)
@@ -1411,7 +1474,7 @@ namespace v2rayN.Forms
         private void tsbQRCodeSwitch_CheckedChanged(object sender, EventArgs e)
         {
             bool bShow = tsbQRCodeSwitch.Checked;
-            scMain.Panel2Collapsed = !bShow;
+            scServers.Panel2Collapsed = !bShow;
         }
         #endregion
 
@@ -1470,7 +1533,7 @@ namespace v2rayN.Forms
                     ts.Checked = true;
                     mainMsgControl.SetToolSslInfo("routing", item.remarks);
                 }
-                ts.Click += new EventHandler(ts_Routing_Click);
+                ts.Click += ts_Routing_Click;
                 lst.Add(ts);
             }
             menuRoutings.DropDownItems.AddRange(lst.ToArray());
@@ -1494,5 +1557,6 @@ namespace v2rayN.Forms
             }
         }
         #endregion
+
     }
 }

v2rayN/v2rayN/Forms/MainForm.resx

@@ -118,11 +118,11 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="scServers.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="scServers.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 17</value>
   </data>
   <metadata name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -203,6 +203,12 @@
   <data name="menuSetDefaultServer.Text" xml:space="preserve">
     <value>Set as active server (Enter)</value>
   </data>
+  <data name="menuServerFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>355, 22</value>
+  </data>
+  <data name="menuServerFilter.Text" xml:space="preserve">
+    <value>Set server filter (Ctrl+F)</value>
+  </data>
   <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
     <value>352, 6</value>
   </data>
@@ -213,29 +219,35 @@
     <value>Move to Group</value>
   </data>
   <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>355, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="menuMoveTop.Text" xml:space="preserve">
     <value>Move to top (T)</value>
   </data>
   <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>355, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="menuMoveUp.Text" xml:space="preserve">
     <value>Up (U)</value>
   </data>
   <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>355, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="menuMoveDown.Text" xml:space="preserve">
     <value>Down (D)</value>
   </data>
   <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>355, 22</value>
+    <value>192, 22</value>
   </data>
   <data name="menuMoveBottom.Text" xml:space="preserve">
     <value>Move to bottom (B)</value>
   </data>
+  <data name="menuMoveEvent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>355, 22</value>
+  </data>
+  <data name="menuMoveEvent.Text" xml:space="preserve">
+    <value>Move to</value>
+  </data>
   <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
     <value>355, 22</value>
   </data>
@@ -269,6 +281,12 @@
   <data name="menuSpeedServer.Text" xml:space="preserve">
     <value>Test servers download speed (Ctrl+T)</value>
   </data>
+  <data name="menuSortServerResult.Size" type="System.Drawing.Size, System.Drawing">
+    <value>355, 22</value>
+  </data>
+  <data name="menuSortServerResult.Text" xml:space="preserve">
+    <value>Sort by test result (Ctrl+E)</value>
+  </data>
   <data name="tsbTestMe.Size" type="System.Drawing.Size, System.Drawing">
     <value>355, 22</value>
   </data>
@@ -308,8 +326,20 @@
   <data name="menuExport2SubContent.Text" xml:space="preserve">
     <value>Export subscription (base64) share to clipboard</value>
   </data>
+  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>64, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>Servers</value>
+  </data>
+  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>356, 666</value>
+    <value>356, 644</value>
   </data>
   <data name="&gt;&gt;cmsLv.Name" xml:space="preserve">
     <value>cmsLv</value>
@@ -354,7 +384,7 @@
     <value>v2rayN.Base.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;lvServers.Parent" xml:space="preserve">
-    <value>scMain.Panel1</value>
+    <value>scServers.Panel1</value>
   </data>
   <data name="&gt;&gt;lvServers.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -378,21 +408,21 @@
     <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;tabGroup.Parent" xml:space="preserve">
-    <value>scMain.Panel1</value>
+    <value>scServers.Panel1</value>
   </data>
   <data name="&gt;&gt;tabGroup.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel1.Name" xml:space="preserve">
-    <value>scMain.Panel1</value>
+  <data name="&gt;&gt;scServers.Panel1.Name" xml:space="preserve">
+    <value>scServers.Panel1</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel1.Type" xml:space="preserve">
+  <data name="&gt;&gt;scServers.Panel1.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel1.Parent" xml:space="preserve">
-    <value>scMain</value>
+  <data name="&gt;&gt;scServers.Panel1.Parent" xml:space="preserve">
+    <value>scServers</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scServers.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <data name="qrCodeControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -417,102 +447,90 @@
     <value>v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;qrCodeControl.Parent" xml:space="preserve">
-    <value>scMain.Panel2</value>
+    <value>scServers.Panel2</value>
   </data>
   <data name="&gt;&gt;qrCodeControl.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel2.Name" xml:space="preserve">
-    <value>scMain.Panel2</value>
+  <data name="&gt;&gt;scServers.Panel2.Name" xml:space="preserve">
+    <value>scServers.Panel2</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel2.Type" xml:space="preserve">
+  <data name="&gt;&gt;scServers.Panel2.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel2.Parent" xml:space="preserve">
-    <value>scMain</value>
+  <data name="&gt;&gt;scServers.Panel2.Parent" xml:space="preserve">
+    <value>scServers</value>
   </data>
-  <data name="&gt;&gt;scMain.Panel2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scServers.Panel2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="scMain.Panel2MinSize" type="System.Int32, mscorlib">
+  <data name="scServers.Panel2MinSize" type="System.Int32, mscorlib">
     <value>100</value>
   </data>
-  <data name="scMain.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="scServers.Size" type="System.Drawing.Size, System.Drawing">
     <value>946, 280</value>
   </data>
-  <data name="scMain.SplitterDistance" type="System.Int32, mscorlib">
+  <data name="scServers.SplitterDistance" type="System.Int32, mscorlib">
     <value>686</value>
   </data>
-  <data name="scMain.TabIndex" type="System.Int32, mscorlib">
+  <data name="scServers.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;scMain.Name" xml:space="preserve">
-    <value>scMain</value>
+  <data name="&gt;&gt;scServers.Name" xml:space="preserve">
+    <value>scServers</value>
   </data>
-  <data name="&gt;&gt;scMain.Type" xml:space="preserve">
+  <data name="&gt;&gt;scServers.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;scMain.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="&gt;&gt;scServers.Parent" xml:space="preserve">
+    <value>gbServers</value>
   </data>
-  <data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scServers.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="tsbServer.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>64, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>Servers</value>
-  </data>
-  <data name="tsbServer.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
-  <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="scBig.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="scBig.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 66</value>
   </data>
-  <data name="splitContainer1.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
+  <data name="scBig.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
     <value>Horizontal</value>
   </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="gbServers.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="gbServers.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="gbServers.Size" type="System.Drawing.Size, System.Drawing">
     <value>952, 300</value>
   </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="gbServers.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="&gt;&gt;gbServers.Name" xml:space="preserve">
+    <value>gbServers</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;gbServers.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>splitContainer1.Panel1</value>
+  <data name="&gt;&gt;gbServers.Parent" xml:space="preserve">
+    <value>scBig.Panel1</value>
   </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;gbServers.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Name" xml:space="preserve">
-    <value>splitContainer1.Panel1</value>
+  <data name="&gt;&gt;scBig.Panel1.Name" xml:space="preserve">
+    <value>scBig.Panel1</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Type" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Panel1.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.Parent" xml:space="preserve">
-    <value>splitContainer1</value>
+  <data name="&gt;&gt;scBig.Panel1.Parent" xml:space="preserve">
+    <value>scBig</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <data name="mainMsgControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -534,42 +552,42 @@
     <value>v2rayN.Forms.MainMsgControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;mainMsgControl.Parent" xml:space="preserve">
-    <value>splitContainer1.Panel2</value>
+    <value>scBig.Panel2</value>
   </data>
   <data name="&gt;&gt;mainMsgControl.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Name" xml:space="preserve">
-    <value>splitContainer1.Panel2</value>
+  <data name="&gt;&gt;scBig.Panel2.Name" xml:space="preserve">
+    <value>scBig.Panel2</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Type" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Panel2.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.Parent" xml:space="preserve">
-    <value>splitContainer1</value>
+  <data name="&gt;&gt;scBig.Panel2.Parent" xml:space="preserve">
+    <value>scBig</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Panel2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Panel2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="scBig.Size" type="System.Drawing.Size, System.Drawing">
     <value>952, 527</value>
   </data>
-  <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
+  <data name="scBig.SplitterDistance" type="System.Int32, mscorlib">
     <value>300</value>
   </data>
-  <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
+  <data name="scBig.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Name" xml:space="preserve">
-    <value>splitContainer1</value>
+  <data name="&gt;&gt;scBig.Name" xml:space="preserve">
+    <value>scBig</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Type" xml:space="preserve">
     <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;scBig.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;splitContainer1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;scBig.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <metadata name="notifyMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -813,28 +831,43 @@
     <value>6, 56</value>
   </data>
   <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 22</value>
+    <value>219, 22</value>
   </data>
   <data name="tsbCheckUpdateN.Text" xml:space="preserve">
     <value>v2rayN (this software)</value>
   </data>
   <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 22</value>
+    <value>219, 22</value>
   </data>
   <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
-    <value>Update v2flyCore</value>
+    <value>Update v2fly Core</value>
   </data>
   <data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 22</value>
+    <value>219, 22</value>
   </data>
   <data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
-    <value>Update XrayCore</value>
+    <value>Update Xray Core</value>
+  </data>
+  <data name="toolStripSeparator16.Size" type="System.Drawing.Size, System.Drawing">
+    <value>216, 6</value>
+  </data>
+  <data name="tsbCheckUpdateClashCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>219, 22</value>
+  </data>
+  <data name="tsbCheckUpdateClashCore.Text" xml:space="preserve">
+    <value>Update clash Core</value>
+  </data>
+  <data name="tsbCheckUpdateClashMetaCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>219, 22</value>
+  </data>
+  <data name="tsbCheckUpdateClashMetaCore.Text" xml:space="preserve">
+    <value>Update Clash.Meta Core</value>
   </data>
   <data name="toolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 6</value>
+    <value>216, 6</value>
   </data>
   <data name="tsbCheckUpdateGeo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 22</value>
+    <value>219, 22</value>
   </data>
   <data name="tsbCheckUpdateGeo.Text" xml:space="preserve">
     <value>Update Geo files</value>
@@ -945,7 +978,7 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>90</value>
+    <value>64</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>
@@ -1037,6 +1070,12 @@
   <data name="&gt;&gt;menuSetDefaultServer.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;menuServerFilter.Name" xml:space="preserve">
+    <value>menuServerFilter</value>
+  </data>
+  <data name="&gt;&gt;menuServerFilter.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;toolStripSeparator3.Name" xml:space="preserve">
     <value>toolStripSeparator3</value>
   </data>
@@ -1049,6 +1088,12 @@
   <data name="&gt;&gt;menuMoveToGroup.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;menuMoveEvent.Name" xml:space="preserve">
+    <value>menuMoveEvent</value>
+  </data>
+  <data name="&gt;&gt;menuMoveEvent.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;menuMoveTop.Name" xml:space="preserve">
     <value>menuMoveTop</value>
   </data>
@@ -1109,6 +1154,12 @@
   <data name="&gt;&gt;menuSpeedServer.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;menuSortServerResult.Name" xml:space="preserve">
+    <value>menuSortServerResult</value>
+  </data>
+  <data name="&gt;&gt;menuSortServerResult.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;tsbTestMe.Name" xml:space="preserve">
     <value>tsbTestMe</value>
   </data>
@@ -1367,6 +1418,24 @@
   <data name="&gt;&gt;tsbCheckUpdateXrayCore.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;toolStripSeparator16.Name" xml:space="preserve">
+    <value>toolStripSeparator16</value>
+  </data>
+  <data name="&gt;&gt;toolStripSeparator16.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsbCheckUpdateClashCore.Name" xml:space="preserve">
+    <value>tsbCheckUpdateClashCore</value>
+  </data>
+  <data name="&gt;&gt;tsbCheckUpdateClashCore.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;tsbCheckUpdateClashMetaCore.Name" xml:space="preserve">
+    <value>tsbCheckUpdateClashMetaCore</value>
+  </data>
+  <data name="&gt;&gt;tsbCheckUpdateClashMetaCore.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;toolStripSeparator15.Name" xml:space="preserve">
     <value>toolStripSeparator15</value>
   </data>

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

@@ -555,4 +555,19 @@
   <data name="menuMoveToGroup.Text" xml:space="preserve">
     <value>移至分组</value>
   </data>
+  <data name="menuMoveEvent.Text" xml:space="preserve">
+    <value>上下移至</value>
+  </data>
+  <data name="menuServerFilter.Text" xml:space="preserve">
+    <value>设置服务器过滤器 (Ctrl+F)</value>
+  </data>
+  <data name="tsbCheckUpdateClashCore.Text" xml:space="preserve">
+    <value>Update clash Core</value>
+  </data>
+  <data name="tsbCheckUpdateClashMetaCore.Text" xml:space="preserve">
+    <value>Update Clash.Meta Core</value>
+  </data>
+  <data name="menuSortServerResult.Text" xml:space="preserve">
+    <value>按测试结果排序 (Ctrl+E)</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/MainMsgControl.cs

@@ -16,7 +16,7 @@ namespace v2rayN.Forms
 {
     public partial class MainMsgControl : UserControl
     {
-        private string MsgFilter = string.Empty;
+        private string _msgFilter = string.Empty;
         delegate void AppendTextDelegate(string text);
 
         public MainMsgControl()
@@ -33,15 +33,15 @@ namespace v2rayN.Forms
 
         public void AppendText(string text)
         {
-            if (this.txtMsgBox.InvokeRequired)
+            if (txtMsgBox.InvokeRequired)
             {
-                Invoke(new AppendTextDelegate(AppendText), new object[] { text });
+                Invoke(new AppendTextDelegate(AppendText), text);
             }
             else
             {
-                if (!Utils.IsNullOrEmpty(MsgFilter))
+                if (!Utils.IsNullOrEmpty(_msgFilter))
                 {
-                    if (!Regex.IsMatch(text, MsgFilter))
+                    if (!Regex.IsMatch(text, _msgFilter))
                     {
                         return;
                     }
@@ -61,10 +61,10 @@ namespace v2rayN.Forms
             {
                 ClearMsg();
             }
-            this.txtMsgBox.AppendText(msg);
+            txtMsgBox.AppendText(msg);
             if (!msg.EndsWith(Environment.NewLine))
             {
-                this.txtMsgBox.AppendText(Environment.NewLine);
+                txtMsgBox.AppendText(Environment.NewLine);
             }
         }
 
@@ -124,7 +124,7 @@ namespace v2rayN.Forms
 
         public void ScrollToCaret()
         {
-            this.txtMsgBox.ScrollToCaret();
+            txtMsgBox.ScrollToCaret();
         }
         #endregion
 
@@ -132,24 +132,24 @@ namespace v2rayN.Forms
         #region MsgBoxMenu
         private void menuMsgBoxSelectAll_Click(object sender, EventArgs e)
         {
-            this.txtMsgBox.Focus();
-            this.txtMsgBox.SelectAll();
+            txtMsgBox.Focus();
+            txtMsgBox.SelectAll();
         }
 
         private void menuMsgBoxCopy_Click(object sender, EventArgs e)
         {
-            var data = this.txtMsgBox.SelectedText.TrimEx();
+            var data = txtMsgBox.SelectedText.TrimEx();
             Utils.SetClipboardData(data);
         }
 
         private void menuMsgBoxCopyAll_Click(object sender, EventArgs e)
         {
-            var data = this.txtMsgBox.Text;
+            var data = txtMsgBox.Text;
             Utils.SetClipboardData(data);
         }
         private void menuMsgBoxClear_Click(object sender, EventArgs e)
         {
-            this.txtMsgBox.Clear();
+            txtMsgBox.Clear();
         }
         private void menuMsgBoxAddRoutingRule_Click(object sender, EventArgs e)
         {
@@ -182,11 +182,12 @@ namespace v2rayN.Forms
         private void menuMsgBoxFilter_Click(object sender, EventArgs e)
         {
             var fm = new MsgFilterSetForm();
-            fm.MsgFilter = MsgFilter;
+            fm.MsgFilter = _msgFilter;
+            fm.ShowDefFilter = true;
             if (fm.ShowDialog() == DialogResult.OK)
             {
-                MsgFilter = fm.MsgFilter;
-                gbMsgTitle.Text = string.Format(ResUI.MsgInformationTitle, MsgFilter);
+                _msgFilter = fm.MsgFilter;
+                gbMsgTitle.Text = string.Format(ResUI.MsgInformationTitle, _msgFilter);
             }
         }
 

v2rayN/v2rayN/Forms/MainMsgControl.resx

@@ -375,9 +375,6 @@
   <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>131, 18</value>
   </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-Hans</value>
-  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs

@@ -30,12 +30,13 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MsgFilterSetForm));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnFilderProxy = new System.Windows.Forms.Button();
+            this.btnFilterDirect = new System.Windows.Forms.Button();
             this.txtMsgFilter = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnClose = new System.Windows.Forms.Button();
             this.btnOK = new System.Windows.Forms.Button();
-            this.btnFilterDirect = new System.Windows.Forms.Button();
-            this.btnFilderProxy = new System.Windows.Forms.Button();
+            this.btnClear = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
@@ -49,6 +50,20 @@
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
+            // btnFilderProxy
+            // 
+            resources.ApplyResources(this.btnFilderProxy, "btnFilderProxy");
+            this.btnFilderProxy.Name = "btnFilderProxy";
+            this.btnFilderProxy.UseVisualStyleBackColor = true;
+            this.btnFilderProxy.Click += new System.EventHandler(this.btnFilderProxy_Click);
+            // 
+            // btnFilterDirect
+            // 
+            resources.ApplyResources(this.btnFilterDirect, "btnFilterDirect");
+            this.btnFilterDirect.Name = "btnFilterDirect";
+            this.btnFilterDirect.UseVisualStyleBackColor = true;
+            this.btnFilterDirect.Click += new System.EventHandler(this.btnFilterDirect_Click);
+            // 
             // txtMsgFilter
             // 
             resources.ApplyResources(this.txtMsgFilter, "txtMsgFilter");
@@ -56,6 +71,7 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.btnClear);
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
             resources.ApplyResources(this.panel2, "panel2");
@@ -76,24 +92,18 @@
             this.btnOK.UseVisualStyleBackColor = true;
             this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
             // 
-            // btnFilterDirect
+            // btnClear
             // 
-            resources.ApplyResources(this.btnFilterDirect, "btnFilterDirect");
-            this.btnFilterDirect.Name = "btnFilterDirect";
-            this.btnFilterDirect.UseVisualStyleBackColor = true;
-            this.btnFilterDirect.Click += new System.EventHandler(this.btnFilterDirect_Click);
-            // 
-            // btnFilderProxy
-            // 
-            resources.ApplyResources(this.btnFilderProxy, "btnFilderProxy");
-            this.btnFilderProxy.Name = "btnFilderProxy";
-            this.btnFilderProxy.UseVisualStyleBackColor = true;
-            this.btnFilderProxy.Click += new System.EventHandler(this.btnFilderProxy_Click);
+            resources.ApplyResources(this.btnClear, "btnClear");
+            this.btnClear.Name = "btnClear";
+            this.btnClear.UseVisualStyleBackColor = true;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
             // 
             // MsgFilterSetForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.panel2);
             this.Name = "MsgFilterSetForm";
@@ -114,5 +124,6 @@
         private System.Windows.Forms.Button btnOK;
         private System.Windows.Forms.Button btnFilderProxy;
         private System.Windows.Forms.Button btnFilterDirect;
+        private System.Windows.Forms.Button btnClear;
     }
 }

v2rayN/v2rayN/Forms/MsgFilterSetForm.cs

@@ -13,6 +13,7 @@ namespace v2rayN.Forms
     public partial class MsgFilterSetForm : BaseForm
     {
         public string MsgFilter { get; set; }
+        public bool ShowDefFilter { get; set; }
 
         public MsgFilterSetForm()
         {
@@ -22,17 +23,19 @@ namespace v2rayN.Forms
         private void MsgFilterSetForm_Load(object sender, EventArgs e)
         {
             txtMsgFilter.Text = MsgFilter;
+            btnFilderProxy.Visible =
+            btnFilterDirect.Visible = ShowDefFilter;
         }
 
         private void btnOK_Click(object sender, EventArgs e)
         {
             MsgFilter = txtMsgFilter.Text;
-            this.DialogResult = DialogResult.OK;
+            DialogResult = DialogResult.OK;
         }
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
 
         private void btnFilderProxy_Click(object sender, EventArgs e)
@@ -44,5 +47,11 @@ namespace v2rayN.Forms
         {
             txtMsgFilter.Text = "^(?!.*direct).*$";
         }
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            MsgFilter = string.Empty;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

v2rayN/v2rayN/Forms/MsgFilterSetForm.resx

@@ -117,14 +117,78 @@
   <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;btnFilderProxy.Name" xml:space="preserve">
+    <value>btnFilderProxy</value>
+  </data>
+  <data name="&gt;&gt;btnFilderProxy.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;btnFilderProxy.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnFilderProxy.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.Name" xml:space="preserve">
+    <value>btnFilterDirect</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.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;btnFilterDirect.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnFilterDirect.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.Name" xml:space="preserve">
+    <value>txtMsgFilter</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.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;txtMsgFilter.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>490, 76</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Filter</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="btnFilderProxy.Location" type="System.Drawing.Point, System.Drawing">
     <value>157, 47</value>
   </data>
   <data name="btnFilderProxy.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 23</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnFilderProxy.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
   </data>
@@ -143,7 +207,6 @@
   <data name="&gt;&gt;btnFilderProxy.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnFilterDirect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -192,81 +255,33 @@
   <data name="&gt;&gt;txtMsgFilter.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="btnClear.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
+    <value>211, 17</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 76</value>
+  <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
   </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
+    <value>14</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Filter</value>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>Clear</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="&gt;&gt;btnClear.Name" xml:space="preserve">
+    <value>btnClear</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="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+  <data name="&gt;&gt;btnClear.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">
+  <data name="&gt;&gt;btnClear.Parent" xml:space="preserve">
     <value>panel2</value>
   </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
     <value>0</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, 76</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 60</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>9</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="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -292,7 +307,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -319,6 +334,30 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>2</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, 76</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>490, 60</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>9</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>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@@ -135,4 +135,7 @@
   <data name="btnFilterDirect.Text" xml:space="preserve">
     <value>过滤Direct</value>
   </data>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>清空</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -50,6 +50,8 @@
             this.txtlocalPort = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.cmbdomainStrategy4Freedom = new System.Windows.Forms.ComboBox();
+            this.label19 = new System.Windows.Forms.Label();
             this.linkDnsObjectDoc = new System.Windows.Forms.LinkLabel();
             this.txtremoteDNS = new System.Windows.Forms.TextBox();
             this.label14 = new System.Windows.Forms.Label();
@@ -68,6 +70,7 @@
             this.txtKcpmtu = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.numStatisticsFreshRate = new System.Windows.Forms.NumericUpDown();
             this.txttrayMenuServersLimit = new System.Windows.Forms.TextBox();
             this.label17 = new System.Windows.Forms.Label();
             this.txtautoUpdateSubInterval = new System.Windows.Forms.TextBox();
@@ -79,7 +82,6 @@
             this.label15 = new System.Windows.Forms.Label();
             this.chkIgnoreGeoUpdateCore = new System.Windows.Forms.CheckBox();
             this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox();
-            this.cbFreshrate = new System.Windows.Forms.ComboBox();
             this.lbFreshrate = new System.Windows.Forms.Label();
             this.chkEnableStatistics = new System.Windows.Forms.CheckBox();
             this.chkAutoRun = new System.Windows.Forms.CheckBox();
@@ -98,6 +100,8 @@
             this.labCoreType1 = new System.Windows.Forms.Label();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label18 = new System.Windows.Forms.Label();
+            this.cmbSystemProxyAdvancedProtocol = new System.Windows.Forms.ComboBox();
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.txtsystemProxyExceptions = new System.Windows.Forms.TextBox();
@@ -110,6 +114,7 @@
             this.tabPage2.SuspendLayout();
             this.tabPage6.SuspendLayout();
             this.tabPage7.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numStatisticsFreshRate)).BeginInit();
             this.tabPageCoreType.SuspendLayout();
             this.tabPage3.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -267,12 +272,31 @@
             // tabPage2
             // 
             resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.cmbdomainStrategy4Freedom);
+            this.tabPage2.Controls.Add(this.label19);
             this.tabPage2.Controls.Add(this.linkDnsObjectDoc);
             this.tabPage2.Controls.Add(this.txtremoteDNS);
             this.tabPage2.Controls.Add(this.label14);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
+            // cmbdomainStrategy4Freedom
+            // 
+            resources.ApplyResources(this.cmbdomainStrategy4Freedom, "cmbdomainStrategy4Freedom");
+            this.cmbdomainStrategy4Freedom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbdomainStrategy4Freedom.FormattingEnabled = true;
+            this.cmbdomainStrategy4Freedom.Items.AddRange(new object[] {
+            resources.GetString("cmbdomainStrategy4Freedom.Items"),
+            resources.GetString("cmbdomainStrategy4Freedom.Items1"),
+            resources.GetString("cmbdomainStrategy4Freedom.Items2"),
+            resources.GetString("cmbdomainStrategy4Freedom.Items3")});
+            this.cmbdomainStrategy4Freedom.Name = "cmbdomainStrategy4Freedom";
+            // 
+            // label19
+            // 
+            resources.ApplyResources(this.label19, "label19");
+            this.label19.Name = "label19";
+            // 
             // linkDnsObjectDoc
             // 
             resources.ApplyResources(this.linkDnsObjectDoc, "linkDnsObjectDoc");
@@ -378,6 +402,7 @@
             // tabPage7
             // 
             resources.ApplyResources(this.tabPage7, "tabPage7");
+            this.tabPage7.Controls.Add(this.numStatisticsFreshRate);
             this.tabPage7.Controls.Add(this.txttrayMenuServersLimit);
             this.tabPage7.Controls.Add(this.label17);
             this.tabPage7.Controls.Add(this.txtautoUpdateSubInterval);
@@ -389,13 +414,17 @@
             this.tabPage7.Controls.Add(this.label15);
             this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
             this.tabPage7.Controls.Add(this.chkKeepOlderDedupl);
-            this.tabPage7.Controls.Add(this.cbFreshrate);
             this.tabPage7.Controls.Add(this.lbFreshrate);
             this.tabPage7.Controls.Add(this.chkEnableStatistics);
             this.tabPage7.Controls.Add(this.chkAutoRun);
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
+            // numStatisticsFreshRate
+            // 
+            resources.ApplyResources(this.numStatisticsFreshRate, "numStatisticsFreshRate");
+            this.numStatisticsFreshRate.Name = "numStatisticsFreshRate";
+            // 
             // txttrayMenuServersLimit
             // 
             resources.ApplyResources(this.txttrayMenuServersLimit, "txttrayMenuServersLimit");
@@ -457,13 +486,6 @@
             this.chkKeepOlderDedupl.Name = "chkKeepOlderDedupl";
             this.chkKeepOlderDedupl.UseVisualStyleBackColor = true;
             // 
-            // cbFreshrate
-            // 
-            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
-            this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbFreshrate.FormattingEnabled = true;
-            this.cbFreshrate.Name = "cbFreshrate";
-            // 
             // lbFreshrate
             // 
             resources.ApplyResources(this.lbFreshrate, "lbFreshrate");
@@ -581,12 +603,25 @@
             // groupBox2
             // 
             resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Controls.Add(this.label18);
+            this.groupBox2.Controls.Add(this.cmbSystemProxyAdvancedProtocol);
             this.groupBox2.Controls.Add(this.label13);
             this.groupBox2.Controls.Add(this.label12);
             this.groupBox2.Controls.Add(this.txtsystemProxyExceptions);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
+            // label18
+            // 
+            resources.ApplyResources(this.label18, "label18");
+            this.label18.Name = "label18";
+            // 
+            // cmbSystemProxyAdvancedProtocol
+            // 
+            resources.ApplyResources(this.cmbSystemProxyAdvancedProtocol, "cmbSystemProxyAdvancedProtocol");
+            this.cmbSystemProxyAdvancedProtocol.FormattingEnabled = true;
+            this.cmbSystemProxyAdvancedProtocol.Name = "cmbSystemProxyAdvancedProtocol";
+            // 
             // label13
             // 
             resources.ApplyResources(this.label13, "label13");
@@ -642,6 +677,7 @@
             this.tabPage6.PerformLayout();
             this.tabPage7.ResumeLayout(false);
             this.tabPage7.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numStatisticsFreshRate)).EndInit();
             this.tabPageCoreType.ResumeLayout(false);
             this.tabPageCoreType.PerformLayout();
             this.tabPage3.ResumeLayout(false);
@@ -689,7 +725,6 @@
         private System.Windows.Forms.CheckBox chkAllowLANConn;
         private System.Windows.Forms.CheckBox chksniffingEnabled;
         private System.Windows.Forms.CheckBox chkEnableStatistics;
-        private System.Windows.Forms.ComboBox cbFreshrate;
         private System.Windows.Forms.Label lbFreshrate;
         private System.Windows.Forms.CheckBox chkKeepOlderDedupl;
         private System.Windows.Forms.CheckBox chkdefAllowInsecure;
@@ -729,5 +764,10 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox txttrayMenuServersLimit;
         private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.ComboBox cmbSystemProxyAdvancedProtocol;
+        private System.Windows.Forms.Label label18;
+        private System.Windows.Forms.NumericUpDown numStatisticsFreshRate;
+        private System.Windows.Forms.ComboBox cmbdomainStrategy4Freedom;
+        private System.Windows.Forms.Label label19;
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -18,6 +18,8 @@ namespace v2rayN.Forms
 
         private void OptionSettingForm_Load(object sender, EventArgs e)
         {
+            cmbSystemProxyAdvancedProtocol.Items.AddRange(Global.IEProxyProtocols.ToArray());
+           
             InitBase();
 
             InitKCP();
@@ -54,10 +56,13 @@ namespace v2rayN.Forms
 
             //remoteDNS
             txtremoteDNS.Text = config.remoteDNS;
+            cmbdomainStrategy4Freedom.Text = config.domainStrategy4Freedom;
 
             chkdefAllowInsecure.Checked = config.defAllowInsecure;
 
             txtsystemProxyExceptions.Text = config.systemProxyExceptions;
+
+            cmbSystemProxyAdvancedProtocol.Text = config.systemProxyAdvancedProtocol;
         }
 
 
@@ -84,32 +89,9 @@ namespace v2rayN.Forms
             chkAutoRun.Checked = Utils.IsAutoRun();
 
             chkEnableStatistics.Checked = config.enableStatistics;
+            numStatisticsFreshRate.Value = config.statisticsFreshRate;
             chkKeepOlderDedupl.Checked = config.keepOlderDedupl;
 
-            ComboItem[] cbSource = new ComboItem[]
-            {
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = ResUI.QuickFresh},
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = ResUI.MediumFresh},
-                new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = ResUI.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;
-            }
-
             chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore;
             chkEnableAutoAdjustMainLvColWidth.Checked = config.uiItem.enableAutoAdjustMainLvColWidth;
             chkEnableSecurityProtocolTls13.Checked = config.enableSecurityProtocolTls13;
@@ -173,7 +155,7 @@ namespace v2rayN.Forms
 
             if (ConfigHandler.SaveConfig(ref config) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -248,11 +230,14 @@ namespace v2rayN.Forms
 
             //remoteDNS          
             config.remoteDNS = txtremoteDNS.Text.TrimEx();
+            config.domainStrategy4Freedom = cmbdomainStrategy4Freedom.Text;
 
             config.defAllowInsecure = chkdefAllowInsecure.Checked;
 
             config.systemProxyExceptions = txtsystemProxyExceptions.Text.TrimEx();
 
+            config.systemProxyAdvancedProtocol = cmbSystemProxyAdvancedProtocol.Text.TrimEx();
+
             return 0;
         }
 
@@ -303,7 +288,8 @@ namespace v2rayN.Forms
 
             bool lastEnableStatistics = config.enableStatistics;
             config.enableStatistics = chkEnableStatistics.Checked;
-            config.statisticsFreshRate = (int)cbFreshrate.SelectedValue;
+            config.statisticsFreshRate = Convert.ToInt32(numStatisticsFreshRate.Value);
+
             config.keepOlderDedupl = chkKeepOlderDedupl.Checked;
 
             config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked;
@@ -329,7 +315,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
 
 

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

@@ -121,120 +121,15 @@
     <value>取消(&amp;C)</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>662, 469</value>
+  </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
   <data name="tabPage1.Text" xml:space="preserve">
     <value>  Core:基础设置  </value>
   </data>
-  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:DNS设置  </value>
-  </data>
-  <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage6.Text" xml:space="preserve">
-    <value>  Core:KCP设置  </value>
-  </data>
-  <data name="txttrayMenuServersLimit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 211</value>
-  </data>
-  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 12</value>
-  </data>
-  <data name="label17.Text" xml:space="preserve">
-    <value>托盘右键菜单服务器展示数量限制</value>
-  </data>
-  <data name="txtautoUpdateSubInterval.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 184</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>173, 12</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>自动更新订阅的间隔(单位小时)</value>
-  </data>
-  <data name="chkEnableSecurityProtocolTls13.Text" xml:space="preserve">
-    <value>启用安全协议TLS v1.3 (订阅/检查更新/测速)</value>
-  </data>
-  <data name="chkEnableAutoAdjustMainLvColWidth.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 16</value>
-  </data>
-  <data name="chkEnableAutoAdjustMainLvColWidth.Text" xml:space="preserve">
-    <value>自动调整服务器列宽在更新订阅后</value>
-  </data>
-  <data name="btnSetLoopback.Text" xml:space="preserve">
-    <value>解除Windows10 UWP应用回环代理限制</value>
-  </data>
-  <data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 157</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 12</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>自动更新Geo文件的间隔(单位小时)</value>
-  </data>
-  <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 16</value>
-  </data>
-  <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
-    <value>更新Core时忽略Geo文件</value>
-  </data>
-  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 16</value>
-  </data>
-  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
-    <value>去重时保留序号较小的项</value>
-  </data>
-  <data name="cbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>431, 37</value>
-  </data>
-  <data name="lbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>339, 41</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="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 16</value>
-  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计(实时网速显示和使用流量显示，需要重启)</value>
-  </data>
-  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 16</value>
-  </data>
-  <data name="chkAutoRun.Text" xml:space="preserve">
-    <value>开机自动启动(可能会不成功)</value>
-  </data>
-  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage7.Text" xml:space="preserve">
-    <value>  v2rayN设置  </value>
-  </data>
-  <data name="tabPageCoreType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPageCoreType.Text" xml:space="preserve">
-    <value>  Core类型设置  </value>
-  </data>
-  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>  系统代理设置  </value>
-  </data>
-  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>662, 469</value>
-  </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>648, 437</value>
   </data>
@@ -325,24 +220,144 @@
   <data name="label2.Text" xml:space="preserve">
     <value>本地监听端口</value>
   </data>
+  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:DNS设置  </value>
+  </data>
+  <data name="cmbdomainStrategy4Freedom.Location" type="System.Drawing.Point, System.Drawing">
+    <value>223, 413</value>
+  </data>
+  <data name="label19.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 417</value>
+  </data>
   <data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 12</value>
   </data>
   <data name="linkDnsObjectDoc.Text" xml:space="preserve">
     <value>支持填写DnsObject,JSON格式</value>
   </data>
+  <data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing">
+    <value>638, 366</value>
+  </data>
   <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
     <value>191, 12</value>
   </data>
   <data name="label14.Text" xml:space="preserve">
     <value>自定义DNS(可多个,用逗号(,)隔开)</value>
   </data>
+  <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage6.Text" xml:space="preserve">
+    <value>  Core:KCP设置  </value>
+  </data>
+  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage7.Text" xml:space="preserve">
+    <value>  v2rayN设置  </value>
+  </data>
+  <data name="numStatisticsFreshRate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>472, 37</value>
+  </data>
+  <data name="txttrayMenuServersLimit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>248, 211</value>
+  </data>
+  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
+    <value>185, 12</value>
+  </data>
+  <data name="label17.Text" xml:space="preserve">
+    <value>托盘右键菜单服务器展示数量限制</value>
+  </data>
+  <data name="txtautoUpdateSubInterval.Location" type="System.Drawing.Point, System.Drawing">
+    <value>248, 184</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>173, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>自动更新订阅的间隔(单位小时)</value>
+  </data>
+  <data name="chkEnableSecurityProtocolTls13.Text" xml:space="preserve">
+    <value>启用安全协议TLS v1.3 (订阅/检查更新/测速)</value>
+  </data>
+  <data name="chkEnableAutoAdjustMainLvColWidth.Size" type="System.Drawing.Size, System.Drawing">
+    <value>204, 16</value>
+  </data>
+  <data name="chkEnableAutoAdjustMainLvColWidth.Text" xml:space="preserve">
+    <value>自动调整服务器列宽在更新订阅后</value>
+  </data>
+  <data name="btnSetLoopback.Text" xml:space="preserve">
+    <value>解除Windows10 UWP应用回环代理限制</value>
+  </data>
+  <data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
+    <value>248, 157</value>
+  </data>
+  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 12</value>
+  </data>
+  <data name="label15.Text" xml:space="preserve">
+    <value>自动更新Geo文件的间隔(单位小时)</value>
+  </data>
+  <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 16</value>
+  </data>
+  <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
+    <value>更新Core时忽略Geo文件</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
+  </data>
+  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+    <value>去重时保留序号较小的项</value>
+  </data>
+  <data name="lbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>339, 41</value>
+  </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>125, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率(单位秒)</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计(实时网速显示和使用流量显示，需要重启)</value>
+  </data>
+  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 16</value>
+  </data>
+  <data name="chkAutoRun.Text" xml:space="preserve">
+    <value>开机自动启动(可能会不成功)</value>
+  </data>
+  <data name="tabPageCoreType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPageCoreType.Text" xml:space="preserve">
+    <value>  Core类型设置  </value>
+  </data>
+  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>  系统代理设置  </value>
+  </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
   <data name="groupBox2.Text" xml:space="preserve">
     <value>例外</value>
   </data>
+  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
+    <value>173, 12</value>
+  </data>
+  <data name="label18.Text" xml:space="preserve">
+    <value>高级代理设置, 协议选择(可选)</value>
+  </data>
   <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 12</value>
   </data>

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs

@@ -31,6 +31,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingRuleSettingDetailsForm));
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
+            this.linkRuleobjectDoc = new System.Windows.Forms.LinkLabel();
             this.chkEnabled = new System.Windows.Forms.CheckBox();
             this.clbInboundTag = new System.Windows.Forms.CheckedListBox();
             this.label2 = new System.Windows.Forms.Label();
@@ -42,6 +43,7 @@
             this.label4 = new System.Windows.Forms.Label();
             this.cmbOutboundTag = new System.Windows.Forms.ComboBox();
             this.panel4 = new System.Windows.Forms.Panel();
+            this.chkAutoSort = new System.Windows.Forms.CheckBox();
             this.btnClose = new System.Windows.Forms.Button();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -64,6 +66,7 @@
             // panel3
             // 
             resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Controls.Add(this.linkRuleobjectDoc);
             this.panel3.Controls.Add(this.chkEnabled);
             this.panel3.Controls.Add(this.clbInboundTag);
             this.panel3.Controls.Add(this.label2);
@@ -76,6 +79,13 @@
             this.panel3.Controls.Add(this.cmbOutboundTag);
             this.panel3.Name = "panel3";
             // 
+            // linkRuleobjectDoc
+            // 
+            resources.ApplyResources(this.linkRuleobjectDoc, "linkRuleobjectDoc");
+            this.linkRuleobjectDoc.Name = "linkRuleobjectDoc";
+            this.linkRuleobjectDoc.TabStop = true;
+            this.linkRuleobjectDoc.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkRuleobjectDoc_LinkClicked);
+            // 
             // chkEnabled
             // 
             resources.ApplyResources(this.chkEnabled, "chkEnabled");
@@ -89,7 +99,9 @@
             this.clbInboundTag.FormattingEnabled = true;
             this.clbInboundTag.Items.AddRange(new object[] {
             resources.GetString("clbInboundTag.Items"),
-            resources.GetString("clbInboundTag.Items1")});
+            resources.GetString("clbInboundTag.Items1"),
+            resources.GetString("clbInboundTag.Items2"),
+            resources.GetString("clbInboundTag.Items3")});
             this.clbInboundTag.MultiColumn = true;
             this.clbInboundTag.Name = "clbInboundTag";
             // 
@@ -150,10 +162,17 @@
             // panel4
             // 
             resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Controls.Add(this.chkAutoSort);
             this.panel4.Controls.Add(this.btnClose);
             this.panel4.Controls.Add(this.btnOK);
             this.panel4.Name = "panel4";
             // 
+            // chkAutoSort
+            // 
+            resources.ApplyResources(this.chkAutoSort, "chkAutoSort");
+            this.chkAutoSort.Name = "chkAutoSort";
+            this.chkAutoSort.UseVisualStyleBackColor = true;
+            // 
             // btnClose
             // 
             resources.ApplyResources(this.btnClose, "btnClose");
@@ -214,6 +233,7 @@
             this.panel3.ResumeLayout(false);
             this.panel3.PerformLayout();
             this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
             this.panel2.ResumeLayout(false);
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
@@ -245,5 +265,7 @@
         private System.Windows.Forms.CheckedListBox clbInboundTag;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.CheckBox chkEnabled;
+        private System.Windows.Forms.CheckBox chkAutoSort;
+        private System.Windows.Forms.LinkLabel linkRuleobjectDoc;
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Handler;
@@ -48,8 +49,16 @@ namespace v2rayN.Forms
                 }
                 rulesItem.inboundTag = inboundTag;
                 rulesItem.outboundTag = cmbOutboundTag.Text;
+                if (chkAutoSort.Checked)
+                {
                     rulesItem.domain = Utils.String2ListSorted(txtDomain.Text);
                     rulesItem.ip = Utils.String2ListSorted(txtIP.Text);
+                }
+                else
+                {
+                    rulesItem.domain = Utils.String2List(txtDomain.Text);
+                    rulesItem.ip = Utils.String2List(txtIP.Text);
+                }
 
                 var protocol = new List<string>();
                 for (int i = 0; i < clbProtocol.Items.Count; i++)
@@ -107,34 +116,33 @@ namespace v2rayN.Forms
         private void btnOK_Click(object sender, EventArgs e)
         {
             EndBindingData();
-            var hasRule = false;
-            if (rulesItem.domain != null && rulesItem.domain.Count > 0)
-            {
-                hasRule = true;
-            }
-            if (rulesItem.ip != null && rulesItem.ip.Count > 0)
-            {
-                hasRule = true;
-            }
-            if (rulesItem.protocol != null && rulesItem.protocol.Count > 0)
-            {
-                hasRule = true;
-            }
-            if (!Utils.IsNullOrEmpty(rulesItem.port))
-            {
-                hasRule = true;
-            }
+
+            bool hasRule = 
+                rulesItem.domain != null 
+                && rulesItem.domain.Count > 0 
+                || rulesItem.ip != null 
+                && rulesItem.ip.Count > 0 
+                || rulesItem.protocol != null 
+                && rulesItem.protocol.Count > 0 
+                || !Utils.IsNullOrEmpty(rulesItem.port);
+
             if (!hasRule)
             {
                 UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP"));
                 return;
             }
-            this.DialogResult = DialogResult.OK;
+
+            DialogResult = DialogResult.OK;
         }
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
+        }
+
+        private void linkRuleobjectDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            Process.Start("https://www.v2fly.org/config/routing.html#ruleobject");
         }
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx

@@ -117,9 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="chkAutoSort.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;linkRuleobjectDoc.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;clbInboundTag.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -128,11 +131,15 @@
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>32</value>
   </data>
+  <data name="&gt;&gt;linkRuleobjectDoc.Type" xml:space="preserve">
+    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="clbProtocol.Size" type="System.Drawing.Size, System.Drawing">
     <value>245, 20</value>
   </data>
-  <data name="clbProtocol.ColumnWidth" type="System.Int32, mscorlib">
-    <value>80</value>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
   </data>
   <data name="cmbOutboundTag.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
@@ -140,7 +147,6 @@
   <data name="cmbOutboundTag.Items" xml:space="preserve">
     <value>proxy</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 4, 4, 4</value>
   </data>
@@ -156,14 +162,11 @@
   <data name="&gt;&gt;clbProtocol.Name" xml:space="preserve">
     <value>clbProtocol</value>
   </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Protocol</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;labRoutingTips.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -175,7 +178,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;clbProtocol.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Left</value>
@@ -193,11 +196,14 @@
     <value>29, 12</value>
   </data>
   <data name="&gt;&gt;clbInboundTag.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="clbInboundTag.Items1" xml:space="preserve">
     <value>http</value>
   </data>
+  <data name="chkAutoSort.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
     <value>panel2</value>
   </data>
@@ -214,7 +220,7 @@
     <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -234,8 +240,11 @@
   <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Bottom</value>
   </data>
+  <data name="linkRuleobjectDoc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
   <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</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>
@@ -246,8 +255,11 @@
   <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
+  <data name="&gt;&gt;chkAutoSort.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
-    <value>598, 16</value>
+    <value>575, 16</value>
   </data>
   <data name="&gt;&gt;txtDomain.Parent" xml:space="preserve">
     <value>groupBox1</value>
@@ -255,11 +267,8 @@
   <data name="labRoutingTips.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="&gt;&gt;label1.Name" xml:space="preserve">
     <value>label1</value>
@@ -267,11 +276,11 @@
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>742, 395</value>
   </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Protocol</value>
   </data>
   <data name="&gt;&gt;cmbOutboundTag.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -291,8 +300,8 @@
   <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
     <value>panel4</value>
   </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
   <data name="clbProtocol.Items2" xml:space="preserve">
     <value>bittorrent</value>
@@ -300,18 +309,21 @@
   <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="clbInboundTag.Items" xml:space="preserve">
-    <value>socks</value>
+  <data name="linkRuleobjectDoc.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
-    <value>panel3</value>
+  <data name="chkAutoSort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>270, 16</value>
   </data>
   <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 82</value>
+    <value>144, 86</value>
   </data>
   <data name="txtIP.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
   </data>
+  <data name="&gt;&gt;panel3.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="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing">
     <value>347, 16</value>
   </data>
@@ -321,6 +333,15 @@
   <data name="&gt;&gt;labRoutingTips.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
+  <data name="chkAutoSort.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
+  </data>
+  <data name="clbProtocol.ColumnWidth" type="System.Int32, mscorlib">
+    <value>80</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
     <value>19, 20</value>
   </data>
@@ -333,11 +354,14 @@
   <data name="clbProtocol.TabIndex" type="System.Int32, mscorlib">
     <value>39</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="linkRuleobjectDoc.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>RoutingRuleSettingDetailsForm</value>
@@ -357,8 +381,11 @@
   <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
     <value>groupBox2</value>
   </data>
+  <data name="linkRuleobjectDoc.Text" xml:space="preserve">
+    <value>Ruleobject Doc</value>
+  </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -369,6 +396,9 @@
   <data name="&gt;&gt;cmbOutboundTag.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
+  <data name="clbInboundTag.Items3" xml:space="preserve">
+    <value>http2</value>
+  </data>
   <data name="&gt;&gt;cmbOutboundTag.Type" xml:space="preserve">
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -384,8 +414,8 @@
   <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
+  <data name="clbInboundTag.Items2" xml:space="preserve">
+    <value>socks2</value>
   </data>
   <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -396,9 +426,15 @@
   <data name="&gt;&gt;txtIP.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
+  <data name="&gt;&gt;chkEnabled.Name" xml:space="preserve">
+    <value>chkEnabled</value>
+  </data>
   <data name="&gt;&gt;label2.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
   <data name="&gt;&gt;label4.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
@@ -426,6 +462,9 @@
   <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
   <data name="txtDomain.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
   </data>
@@ -441,9 +480,6 @@
   <data name="btnOK.Text" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
   <data name="&gt;&gt;labRoutingTips.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -468,6 +504,9 @@
   <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing">
     <value>347, 43</value>
   </data>
+  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
   <data name="&gt;&gt;txtDomain.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
@@ -480,12 +519,18 @@
   <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
     <value>btnOK</value>
   </data>
+  <data name="linkRuleobjectDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 0, 0, 0</value>
+  </data>
   <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
   <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 21</value>
   </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
   <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
@@ -501,6 +546,9 @@
   <data name="&gt;&gt;txtIP.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="linkRuleobjectDoc.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
   <data name="&gt;&gt;label1.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
@@ -516,8 +564,8 @@
   <data name="label2.Text" xml:space="preserve">
     <value>inboundTag</value>
   </data>
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
+  <data name="&gt;&gt;chkAutoSort.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
     <value>742, 60</value>
@@ -525,6 +573,9 @@
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 121</value>
   </data>
+  <data name="&gt;&gt;chkAutoSort.Name" xml:space="preserve">
+    <value>chkAutoSort</value>
+  </data>
   <data name="&gt;&gt;panel4.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
@@ -532,7 +583,13 @@
     <value>*Set the rules, separated by commas (,); The comma in the regular is replaced by &lt;COMMA&gt;</value>
   </data>
   <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>245, 20</value>
+    <value>345, 20</value>
+  </data>
+  <data name="&gt;&gt;linkRuleobjectDoc.Name" xml:space="preserve">
+    <value>linkRuleobjectDoc</value>
+  </data>
+  <data name="clbInboundTag.Items" xml:space="preserve">
+    <value>socks</value>
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 12</value>
@@ -553,10 +610,10 @@
     <value>6, 12</value>
   </data>
   <data name="&gt;&gt;chkEnabled.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
-    <value>617, 19</value>
+    <value>632, 45</value>
   </data>
   <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 10</value>
@@ -567,6 +624,9 @@
   <data name="&gt;&gt;txtDomain.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="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>274, 20</value>
+  </data>
   <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -588,14 +648,14 @@
   <data name="&gt;&gt;cmbOutboundTag.Name" xml:space="preserve">
     <value>cmbOutboundTag</value>
   </data>
-  <data name="&gt;&gt;chkEnabled.Name" xml:space="preserve">
-    <value>chkEnabled</value>
+  <data name="chkAutoSort.Text" xml:space="preserve">
+    <value>Domain and ip are auto sorted when saving</value>
   </data>
   <data name="txtDomain.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 20</value>
+  <data name="linkRuleobjectDoc.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 86</value>
   </data>
   <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -612,6 +672,9 @@
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>392, 395</value>
   </data>
+  <data name="chkAutoSort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>41, 18</value>
+  </data>
   <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
@@ -619,7 +682,10 @@
     <value>clbInboundTag</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
+  </data>
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -648,8 +714,8 @@
   <data name="&gt;&gt;clbInboundTag.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
-  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</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>
@@ -663,18 +729,21 @@
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
     <value>350, 395</value>
   </data>
+  <data name="&gt;&gt;chkAutoSort.Parent" xml:space="preserve">
+    <value>panel4</value>
+  </data>
   <data name="&gt;&gt;clbProtocol.Parent" xml:space="preserve">
     <value>panel3</value>
   </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>Domain</value>
   </data>
-  <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
   <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
     <value>504, 15</value>
   </data>
+  <data name="&gt;&gt;linkRuleobjectDoc.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
   <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 16</value>
   </data>

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

@@ -118,14 +118,20 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="linkRuleobjectDoc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>101, 12</value>
+  </data>
+  <data name="linkRuleobjectDoc.Text" xml:space="preserve">
+    <value>规则详细说明文档</value>
+  </data>
   <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
-    <value>670, 18</value>
+    <value>670, 48</value>
   </data>
   <data name="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing">
     <value>372, 16</value>
   </data>
   <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 20</value>
+    <value>347, 20</value>
   </data>
   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
     <value>279, 20</value>
@@ -154,6 +160,12 @@
   <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
     <value>120, 16</value>
   </data>
+  <data name="chkAutoSort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 16</value>
+  </data>
+  <data name="chkAutoSort.Text" xml:space="preserve">
+    <value>保存时Domain和IP自动排序</value>
+  </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs

@@ -15,9 +15,9 @@ namespace v2rayN.Forms
         {
             get; set;
         }
-        protected RoutingItem routingItem = null;
+        protected RoutingItem routingItem;
 
-        private List<int> lvSelecteds = new List<int>();
+        private readonly List<int> lvSelecteds = new List<int>();
         public RoutingRuleSettingForm()
         {
             InitializeComponent();
@@ -25,14 +25,7 @@ namespace v2rayN.Forms
 
         private void RoutingRuleSettingForm_Load(object sender, EventArgs e)
         {
-            if (EditIndex >= 0)
-            {
-                routingItem = config.routings[EditIndex];
-            }
-            else
-            {
-                routingItem = new RoutingItem();
-            }
+            routingItem = EditIndex >= 0 ? config.routings[EditIndex] : new RoutingItem();
             if (routingItem.rules == null)
             {
                 routingItem.rules = new List<RulesItem>();
@@ -86,10 +79,8 @@ namespace v2rayN.Forms
             lvRoutings.BeginUpdate();
             lvRoutings.Items.Clear();
 
-            for (int k = 0; k < routingItem.rules.Count; k++)
+            foreach (var item in routingItem.rules)
             {
-                var item = routingItem.rules[k];
-
                 ListViewItem lvItem = new ListViewItem("");
                 Utils.AddSubItem(lvItem, "outboundTag", item.outboundTag);
                 Utils.AddSubItem(lvItem, "port", item.port);
@@ -112,7 +103,7 @@ namespace v2rayN.Forms
 
             if (ConfigHandler.AddRoutingItem(ref config, routingItem, EditIndex) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -122,7 +113,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
         private void btnBrowse_Click(object sender, EventArgs e)
         {

v2rayN/v2rayN/Forms/RoutingSettingForm.cs

@@ -10,8 +10,8 @@ namespace v2rayN.Forms
 {
     public partial class RoutingSettingForm : BaseForm
     {
-        private List<int> lvSelecteds = new List<int>();
-        private RoutingItem lockedItem;
+        private readonly List<int> _lvSelecteds = new List<int>();
+        private RoutingItem _lockedItem;
         public RoutingSettingForm()
         {
             InitializeComponent();
@@ -58,7 +58,7 @@ namespace v2rayN.Forms
 
             if (ConfigHandler.SaveRouting(ref config) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -68,7 +68,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
         private void chkenableRoutingAdvanced_CheckedChanged_1(object sender, EventArgs e)
         {
@@ -78,20 +78,20 @@ namespace v2rayN.Forms
         {
             if (chkenableRoutingAdvanced.Checked)
             {
-                this.tabPageProxy.Parent = null;
-                this.tabPageDirect.Parent = null;
-                this.tabPageBlock.Parent = null;
-                this.tabPageRuleList.Parent = tabNormal;
+                tabPageProxy.Parent = null;
+                tabPageDirect.Parent = null;
+                tabPageBlock.Parent = null;
+                tabPageRuleList.Parent = tabNormal;
                 MenuItemBasic.Enabled = false;
                 MenuItemAdvanced.Enabled = true;
 
             }
             else
             {
-                this.tabPageProxy.Parent = tabNormal;
-                this.tabPageDirect.Parent = tabNormal;
-                this.tabPageBlock.Parent = tabNormal;
-                this.tabPageRuleList.Parent = null;
+                tabPageProxy.Parent = tabNormal;
+                tabPageDirect.Parent = tabNormal;
+                tabPageBlock.Parent = tabNormal;
+                tabPageRuleList.Parent = null;
                 MenuItemBasic.Enabled = true;
                 MenuItemAdvanced.Enabled = false;
             }
@@ -102,31 +102,31 @@ namespace v2rayN.Forms
         #region locked
         private void BindingLockedData()
         {
-            lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
-            if (lockedItem != null)
+            _lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
+            if (_lockedItem != null)
             {
-                txtProxyDomain.Text = Utils.List2String(lockedItem.rules[0].domain, true);
-                txtProxyIp.Text = Utils.List2String(lockedItem.rules[0].ip, true);
+                txtProxyDomain.Text = Utils.List2String(_lockedItem.rules[0].domain, true);
+                txtProxyIp.Text = Utils.List2String(_lockedItem.rules[0].ip, true);
 
-                txtDirectDomain.Text = Utils.List2String(lockedItem.rules[1].domain, true);
-                txtDirectIp.Text = Utils.List2String(lockedItem.rules[1].ip, true);
+                txtDirectDomain.Text = Utils.List2String(_lockedItem.rules[1].domain, true);
+                txtDirectIp.Text = Utils.List2String(_lockedItem.rules[1].ip, true);
 
-                txtBlockDomain.Text = Utils.List2String(lockedItem.rules[2].domain, true);
-                txtBlockIp.Text = Utils.List2String(lockedItem.rules[2].ip, true);
+                txtBlockDomain.Text = Utils.List2String(_lockedItem.rules[2].domain, true);
+                txtBlockIp.Text = Utils.List2String(_lockedItem.rules[2].ip, true);
             }
         }
         private void EndBindingLockedData()
         {
-            if (lockedItem != null)
+            if (_lockedItem != null)
             {
-                lockedItem.rules[0].domain = Utils.String2List(txtProxyDomain.Text.TrimEx());
-                lockedItem.rules[0].ip = Utils.String2List(txtProxyIp.Text.TrimEx());
+                _lockedItem.rules[0].domain = Utils.String2List(txtProxyDomain.Text.TrimEx());
+                _lockedItem.rules[0].ip = Utils.String2List(txtProxyIp.Text.TrimEx());
 
-                lockedItem.rules[1].domain = Utils.String2List(txtDirectDomain.Text.TrimEx());
-                lockedItem.rules[1].ip = Utils.String2List(txtDirectIp.Text.TrimEx());
+                _lockedItem.rules[1].domain = Utils.String2List(txtDirectDomain.Text.TrimEx());
+                _lockedItem.rules[1].ip = Utils.String2List(txtDirectIp.Text.TrimEx());
 
-                lockedItem.rules[2].domain = Utils.String2List(txtBlockDomain.Text.TrimEx());
-                lockedItem.rules[2].ip = Utils.String2List(txtBlockIp.Text.TrimEx());
+                _lockedItem.rules[2].domain = Utils.String2List(txtBlockDomain.Text.TrimEx());
+                _lockedItem.rules[2].ip = Utils.String2List(txtBlockIp.Text.TrimEx());
 
             }
         }
@@ -207,7 +207,7 @@ namespace v2rayN.Forms
         private int GetLvSelectedIndex()
         {
             int index = -1;
-            lvSelecteds.Clear();
+            _lvSelecteds.Clear();
             try
             {
                 if (lvRoutings.SelectedIndices.Count <= 0)
@@ -219,7 +219,7 @@ namespace v2rayN.Forms
                 index = lvRoutings.SelectedIndices[0];
                 foreach (int i in lvRoutings.SelectedIndices)
                 {
-                    lvSelecteds.Add(i);
+                    _lvSelecteds.Add(i);
                 }
                 return index;
             }
@@ -264,7 +264,7 @@ namespace v2rayN.Forms
             {
                 return;
             }
-            for (int k = lvSelecteds.Count - 1; k >= 0; k--)
+            for (int k = _lvSelecteds.Count - 1; k >= 0; k--)
             {
                 config.routings.RemoveAt(index);
             }

v2rayN/v2rayN/Forms/ServerTransportControl.cs

@@ -9,7 +9,7 @@ namespace v2rayN.Forms
     public partial class ServerTransportControl : UserControl
     {
         public bool AllowXtls { get; set; }
-        private VmessItem vmessItem = null;
+        private VmessItem vmessItem;
 
         public ServerTransportControl()
         {

v2rayN/v2rayN/Forms/SubSettingControl.cs

@@ -26,7 +26,7 @@ namespace v2rayN.Forms
 
         private void SubSettingControl_Load(object sender, EventArgs e)
         {
-            this.Height = grbMain.Height;
+            Height = grbMain.Height;
 
             groupItem = LazyConfig.Instance.GetConfig().groupItem;
 
@@ -90,7 +90,7 @@ namespace v2rayN.Forms
 
         private void btnShare_Click(object sender, EventArgs e)
         {
-            if (this.Height <= grbMain.Height)
+            if (Height <= grbMain.Height)
             {
                 if (Utils.IsNullOrEmpty(subItem.url))
                 {
@@ -98,11 +98,11 @@ namespace v2rayN.Forms
                     return;
                 }
                 picQRCode.Image = QRCodeHelper.GetQRCode(subItem.url);
-                this.Height = grbMain.Height + 200;
+                Height = grbMain.Height + 200;
             }
             else
             {
-                this.Height = grbMain.Height;
+                Height = grbMain.Height;
             }
         }
     }

v2rayN/v2rayN/Forms/SubSettingForm.cs

@@ -71,7 +71,7 @@ namespace v2rayN.Forms
         {
             if (ConfigHandler.SaveSubItem(ref config) == 0)
             {
-                this.DialogResult = DialogResult.OK;
+                DialogResult = DialogResult.OK;
             }
             else
             {
@@ -81,7 +81,7 @@ namespace v2rayN.Forms
 
         private void btnClose_Click(object sender, EventArgs e)
         {
-            this.DialogResult = DialogResult.Cancel;
+            DialogResult = DialogResult.Cancel;
         }
 
         private void btnAdd_Click(object sender, EventArgs e)

v2rayN/v2rayN/Global.cs

@@ -18,6 +18,8 @@ namespace v2rayN
         public const string clashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases";
         public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases";
         public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
+        public const string tuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
+        public const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
 
 
 
@@ -190,21 +192,22 @@ namespace v2rayN
         /// </summary>
         public const string CustomIconName = "v2rayN.ico";
 
-        public enum StatisticsFreshRate
-        {
-            quick = 1000,
-            medium = 2000,
-            slow = 3000
-        }
         public const string StatisticLogOverall = "StatisticLogOverall.json";
 
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
+        public static readonly List<string> IEProxyProtocols = new List<string> {
+                        "{ip}:{http_port}",
+                        "socks={ip}:{socks_port}",
+                        "http={ip}:{http_port};https={ip}:{http_port};ftp={ip}:{http_port};socks={ip}:{socks_port}",
+                        "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
+                        ""
+                    };
 
         public const string RoutingRuleComma = "<COMMA>";
 
         public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
         public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> ssSecuritysInXray = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> ssSecuritysInXray = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
         public static readonly List<string> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443" };
         public static readonly List<string> networks = new List<string> { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
         public static readonly List<string> kcpHeaderTypes = new List<string> { "srtp", "utp", "wechat-video", "dtls", "wireguard" };

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -6,6 +6,7 @@ using v2rayN.Mode;
 using v2rayN.Base;
 using System.Linq;
 using v2rayN.Tool;
+using System.Threading.Tasks;
 
 namespace v2rayN.Handler
 {
@@ -53,11 +54,9 @@ namespace v2rayN.Handler
                     //Mux
                     muxEnabled = false,
 
-                    // 默认不开启统计
                     enableStatistics = false,
 
-                    // 默认中等刷新率
-                    statisticsFreshRate = (int)Global.StatisticsFreshRate.medium,
+                    statisticsFreshRate = 1,
 
                     enableRoutingAdvanced = true
                 };
@@ -157,7 +156,10 @@ namespace v2rayN.Handler
             {
                 config.groupItem = new List<GroupItem>();
             }
-
+            if (config.statisticsFreshRate > 100)
+            {
+                config.statisticsFreshRate = 1;
+            }
 
             if (config == null
                 || config.vmess.Count <= 0
@@ -207,7 +209,28 @@ namespace v2rayN.Handler
         {
             lock (objLock)
             {
-                Utils.ToJsonFile(config, Utils.GetPath(configRes));
+                try
+                {
+
+                    //save temp file
+                    var resPath = Utils.GetPath(configRes);
+                    var tempPath = $"{resPath}_temp";
+                    if (Utils.ToJsonFile(config, tempPath) != 0)
+                    {
+                        return;
+                    }
+
+                    if (File.Exists(resPath))
+                    {
+                        File.Delete(resPath);
+                    }
+                    //rename
+                    File.Move(tempPath, resPath);
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog("ToJsonFile", ex);
+                }
             }
         }
 
@@ -223,7 +246,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int AddServer(ref Config config, VmessItem vmessItem, bool toFile = true)
         {
-            vmessItem.configType = EConfigType.Vmess;
+            vmessItem.configType = EConfigType.VMess;
 
             vmessItem.address = vmessItem.address.TrimEx();
             vmessItem.id = vmessItem.id.TrimEx();
@@ -282,10 +305,20 @@ namespace v2rayN.Handler
             {
                 VmessItem vmessItem = Utils.DeepCopy(item);
                 vmessItem.indexId = string.Empty;
-                vmessItem.remarks = string.Format("{0}-clone", item.remarks);
+                vmessItem.remarks = $"{item.remarks}-clone";
 
+                if (vmessItem.configType == EConfigType.Custom)
+                {
+                    vmessItem.address = Utils.GetConfigPath(vmessItem.address);
+                    if (AddCustomServer(ref config, vmessItem, false) == 0)
+                    {
+                    }
+                }
+                else
+                {
                     AddServerCommon(ref config, vmessItem);
                 }
+            }
 
             ToJsonFile(config);
 
@@ -437,19 +470,20 @@ namespace v2rayN.Handler
                 return -1;
             }
             var ext = Path.GetExtension(fileName);
-            string newFileName = string.Format("{0}{1}", Utils.GetGUID(), ext);
+            string newFileName = $"{Utils.GetGUID()}{ext}";
             //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
 
             try
             {
-                File.Copy(fileName, Path.Combine(Utils.GetConfigPath(), newFileName));
+                File.Copy(fileName, Utils.GetConfigPath(newFileName));
                 if (blDelete)
                 {
                     File.Delete(fileName);
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 return -1;
             }
 
@@ -457,7 +491,7 @@ namespace v2rayN.Handler
             vmessItem.configType = EConfigType.Custom;
             if (Utils.IsNullOrEmpty(vmessItem.remarks))
             {
-                vmessItem.remarks = string.Format("import custom@{0}", DateTime.Now.ToShortDateString());
+                vmessItem.remarks = $"import custom@{DateTime.Now.ToShortDateString()}";
             }
 
 
@@ -577,7 +611,7 @@ namespace v2rayN.Handler
                 {
                     return 0;
                 }
-                if (vmessItem.configType == EConfigType.Vmess)
+                if (vmessItem.configType == EConfigType.VMess)
                 {
                     string path = "";
                     string host = "";
@@ -782,7 +816,8 @@ namespace v2rayN.Handler
                 && o.path == n.path
                 && o.streamSecurity == n.streamSecurity
                 && o.flow == n.flow
-                && (remarks ? o.remarks == n.remarks : true);
+                && o.sni == n.sni
+                && (!remarks || o.remarks == n.remarks);
         }
 
         private static int RemoveVmessItem(Config config, int index)
@@ -864,7 +899,7 @@ namespace v2rayN.Handler
                 //groupId
                 vmessItem.groupId = groupId;
 
-                if (vmessItem.configType == EConfigType.Vmess)
+                if (vmessItem.configType == EConfigType.VMess)
                 {
                     if (AddServer(ref config, vmessItem, false) == 0)
                     {
@@ -940,14 +975,43 @@ namespace v2rayN.Handler
                 vmessItem.address = fileName;
                 vmessItem.remarks = "clash_custom";
             }
+            //Is hysteria configuration
+            else if (clipboardData.IndexOf("server") >= 0
+                && clipboardData.IndexOf("up") >= 0
+                && clipboardData.IndexOf("down") >= 0
+                && clipboardData.IndexOf("listen") >= 0
+                && clipboardData.IndexOf("<html>") < 0
+                && clipboardData.IndexOf("<body>") < 0)
+            {
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
+                File.WriteAllText(fileName, clipboardData);
+
+                vmessItem.coreType = ECoreType.hysteria;
+                vmessItem.address = fileName;
+                vmessItem.remarks = "hysteria_custom";
+            }
+            //Is naiveproxy configuration
+            else if (clipboardData.IndexOf("listen") >= 0
+                && clipboardData.IndexOf("proxy") >= 0
+                && clipboardData.IndexOf("<html>") < 0
+                && clipboardData.IndexOf("<body>") < 0)
+            {
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
+                File.WriteAllText(fileName, clipboardData);
+
+                vmessItem.coreType = ECoreType.naiveproxy;
+                vmessItem.address = fileName;
+                vmessItem.remarks = "naiveproxy_custom";
+            }
             //Is Other configuration
             else
             {
-                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt");
-                File.WriteAllText(fileName, clipboardData);
+                return -1;
+                //var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt");
+                //File.WriteAllText(fileName, clipboardData);
 
-                vmessItem.address = fileName;
-                vmessItem.remarks = "other_custom";
+                //vmessItem.address = fileName;
+                //vmessItem.remarks = "other_custom";
             }
 
             if (!Utils.IsNullOrEmpty(subid))
@@ -977,6 +1041,56 @@ namespace v2rayN.Handler
             }
         }
 
+        private static int AddBatchServers4SsSIP008(ref Config config, string clipboardData, string subid, List<VmessItem> lstOriSub, string groupId)
+        {
+            if (Utils.IsNullOrEmpty(clipboardData))
+            {
+                return -1;
+            }
+
+            if (!Utils.IsNullOrEmpty(subid))
+            {
+                RemoveServerViaSubid(ref config, subid);
+            }
+
+            //SsSIP008
+            var lstSsServer = Utils.FromJson<List<SsServer>>(clipboardData);
+            if (lstSsServer == null || lstSsServer.Count <= 0)
+            {
+                var ssSIP008 = Utils.FromJson<SsSIP008>(clipboardData);
+                if (ssSIP008?.servers != null && ssSIP008.servers.Count > 0)
+                {
+                    lstSsServer = ssSIP008.servers;
+                }
+            }
+
+            if (lstSsServer != null && lstSsServer.Count > 0)
+            {
+                int counter = 0;
+                foreach (var it in lstSsServer)
+                {
+                    var ssItem = new VmessItem()
+                    {
+                        subid = subid,
+                        groupId = groupId,
+                        remarks = it.remarks,
+                        security = it.method,
+                        id = it.password,
+                        address = it.server,
+                        port = Utils.ToInt(it.server_port)
+                    };
+                    if (AddShadowsocksServer(ref config, ssItem, false) == 0)
+                    {
+                        counter++;
+                    }
+                }
+                ToJsonFile(config);
+                return counter;
+            }
+
+            return -1;
+        }
+
         public static int AddBatchServers(ref Config config, string clipboardData, string subid, string groupId)
         {
             List<VmessItem> lstOriSub = null;
@@ -991,6 +1105,11 @@ namespace v2rayN.Handler
                 counter = AddBatchServers(ref config, Utils.Base64Decode(clipboardData), subid, lstOriSub, groupId);
             }
 
+            if (counter < 1)
+            {
+                counter = AddBatchServers4SsSIP008(ref config, clipboardData, subid, lstOriSub, groupId);
+            }
+
             //maybe other sub 
             if (counter < 1)
             {
@@ -1042,13 +1161,10 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            foreach (SubItem item in config.subItem)
-            {
-                if (Utils.IsNullOrEmpty(item.id))
+            foreach (var item in config.subItem.Where(item => Utils.IsNullOrEmpty(item.id)))
             {
                 item.id = Utils.GetGUID(false);
             }
-            }
 
             ToJsonFile(config);
             return 0;
@@ -1091,13 +1207,10 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            foreach (GroupItem item in config.groupItem)
-            {
-                if (Utils.IsNullOrEmpty(item.id))
+            foreach (var item in config.groupItem.Where(item => Utils.IsNullOrEmpty(item.id)))
             {
                 item.id = Utils.GetGUID(false);
             }
-            }
 
             ToJsonFile(config);
             return 0;

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -29,8 +30,8 @@ namespace v2rayN.Handler
 
             public ResultEventArgs(bool success, string msg)
             {
-                this.Success = success;
-                this.Msg = msg;
+                Success = success;
+                Msg = msg;
             }
         }
 
@@ -46,12 +47,12 @@ namespace v2rayN.Handler
                     Proxy = webProxy
                 });
 
-                var progress = new Progress<double>();
+                var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
                 {
                     if (UpdateCompleted != null)
                     {
-                        string msg = string.Format("{0} M/s", value.ToString("#0.0")).PadLeft(9, ' ');
+                        string msg = $"{value} M/s".PadLeft(9, ' ');
                         UpdateCompleted(this, new ResultEventArgs(false, msg));
                     }
                 };
@@ -67,6 +68,10 @@ namespace v2rayN.Handler
             {
                 //Utils.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex)); 
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
             }
             return 0;
         }
@@ -88,7 +93,7 @@ namespace v2rayN.Handler
                 {
                     if (UpdateCompleted != null)
                     {
-                        string msg = string.Format("...{0}%", value);
+                        string msg = $"...{value}%";
                         UpdateCompleted(this, new ResultEventArgs(value > 100 ? true : false, msg));
                     }
                 };
@@ -105,6 +110,10 @@ namespace v2rayN.Handler
                 Utils.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex)); 
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
             }
         }
 
@@ -156,12 +165,21 @@ namespace v2rayN.Handler
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
-                var result = await HttpClientHelper.GetInstance().GetAsync(client, url);
+
+                var cts = new CancellationTokenSource();
+                cts.CancelAfter(1000 * 30);
+
+                var result = await HttpClientHelper.GetInstance().GetAsync(client, url, cts.Token);
                 return result;
             }
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
             }
             return null;
         }
@@ -202,7 +220,7 @@ namespace v2rayN.Handler
             try
             {
                 HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
-                myHttpWebRequest.Timeout = 5000;
+                myHttpWebRequest.Timeout = 30 * 1000;
                 myHttpWebRequest.Proxy = webProxy;
 
                 Stopwatch timer = new Stopwatch();
@@ -234,13 +252,35 @@ namespace v2rayN.Handler
                 return null;
             }
             var httpPort = LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp);
-            var webProxy = new WebProxy(Global.Loopback, httpPort);
-            if (RunAvailabilityCheck(webProxy) > 0)
+            if (!SocketCheck(Global.Loopback, httpPort))
             {
-                return webProxy;
+                return null;
             }
 
-            return null;
+            return new WebProxy(Global.Loopback, httpPort);
+        }
+
+        private bool SocketCheck(string ip, int port)
+        {
+            Socket sock = null;
+            try
+            {
+                IPAddress ipa = IPAddress.Parse(ip);
+                IPEndPoint point = new IPEndPoint(ipa, port);
+                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                sock.Connect(point);
+                return true;
+            }
+            catch { }
+            finally
+            {
+                if (sock != null)
+                {
+                    sock.Close();
+                    sock.Dispose();
+                }
+            }
+            return false;
         }
     }
 }

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -11,10 +11,8 @@ namespace v2rayN.Handler
         private Config _config;
         private List<CoreInfo> coreInfos;
 
-        public static LazyConfig Instance
-        {
-            get { return _instance.Value; }
-        }
+        public static LazyConfig Instance => _instance.Value;
+
         public void SetConfig(ref Config config)
         {
             _config = config;
@@ -66,12 +64,24 @@ namespace v2rayN.Handler
         {
             coreInfos = new List<CoreInfo>();
 
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.v2rayN,
+                coreUrl = Global.NUrl,
+                coreLatestUrl = Global.NUrl + "/latest",
+                coreDownloadUrl32 = Global.NUrl + "/download/{0}/v2rayN.zip",
+                coreDownloadUrl64 = Global.NUrl + "/download/{0}/v2rayN.zip",
+            });
+
             coreInfos.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly,
                 coreExes = new List<string> { "wv2ray", "v2ray" },
                 arguments = "",
                 coreUrl = Global.v2flyCoreUrl,
+                coreLatestUrl = Global.v2flyCoreUrl + "/latest",
+                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 match = "V2Ray"
             });
 
@@ -81,6 +91,9 @@ namespace v2rayN.Handler
                 coreExes = new List<string> { "xray" },
                 arguments = "",
                 coreUrl = Global.xrayCoreUrl,
+                coreLatestUrl = Global.xrayCoreUrl + "/latest",
+                coreDownloadUrl32 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
                 match = "Xray"
             });
 
@@ -89,15 +102,22 @@ namespace v2rayN.Handler
                 coreType = ECoreType.clash,
                 coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashCoreUrl
+                coreUrl = Global.clashCoreUrl,
+                coreLatestUrl = Global.clashCoreUrl + "/latest",
+                coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip",
+                match = "v"
             });
 
             coreInfos.Add(new CoreInfo
             {
                 coreType = ECoreType.clash_meta,
-                coreExes = new List<string> { "Clash.Meta-windows-amd64v1", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
+                coreExes = new List<string> { "Clash.Meta-windows-amd64v1", "Clash.Meta-windows-amd64", "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashMetaCoreUrl
+                coreUrl = Global.clashMetaCoreUrl,
+                coreLatestUrl = Global.clashMetaCoreUrl + "/latest",
+                coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
             });
 
             coreInfos.Add(new CoreInfo
@@ -105,7 +125,10 @@ namespace v2rayN.Handler
                 coreType = ECoreType.hysteria,
                 coreExes = new List<string> { "hysteria-tun-windows-6.0-amd64", "hysteria-tun-windows-6.0-386", "hysteria" },
                 arguments = "",
-                coreUrl = Global.hysteriaCoreUrl
+                coreUrl = Global.hysteriaCoreUrl,
+                coreLatestUrl = Global.hysteriaCoreUrl + "/latest",
+                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-tun-windows-6.0-386.exe",
+                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-tun-windows-6.0-amd64.exe",
             });
 
             coreInfos.Add(new CoreInfo
@@ -115,6 +138,14 @@ namespace v2rayN.Handler
                 arguments = "config.json",
                 coreUrl = Global.naiveproxyCoreUrl
             });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.tuic,
+                coreExes = new List<string> { "tuic-client", "tuic" },
+                arguments = "-c config.json",
+                coreUrl = Global.tuicCoreUrl
+            });
         }
 
     }

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -24,20 +24,65 @@ namespace v2rayN.Handler
         //private List<int> _selecteds;
         //private Thread _workThread;
         //Action<int, string> _updateFunc;
-        public static MainFormHandler Instance
-        {
-            get { return instance.Value; }
-        }
+        public static MainFormHandler Instance => instance.Value;
+
         public Icon GetNotifyIcon(Config config, Icon def)
         {
             try
             {
+                int index = (int)config.sysProxyType;
+
+                //Load from routing setting
+                var createdIcon = GetNotifyIcon4Routing(config);
+                if (createdIcon != null)
+                {
+                    return createdIcon;
+                }
+
+                //Load from local file
+                var fileName = Utils.GetPath($"NotifyIcon{index + 1}.ico");
+                if (File.Exists(fileName))
+                {
+                    return new Icon(fileName);
+                }
+                switch (index)
+                {
+                    case 0:
+                        return Properties.Resources.NotifyIcon1;
+                    case 1:
+                        return Properties.Resources.NotifyIcon2;
+                    case 2:
+                        return Properties.Resources.NotifyIcon3;
+                }
+
+                return Properties.Resources.NotifyIcon1;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return def;
+            }
+        }
+        private Icon GetNotifyIcon4Routing(Config config)
+        {
+            try
+            {
+                if (!config.enableRoutingAdvanced)
+                {
+                    return null;
+                }
+
+                var item = config.routings[config.routingIndex];
+                if (Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
+                {
+                    return null;
+                }
+
                 Color color = ColorTranslator.FromHtml("#3399CC");
                 int index = (int)config.sysProxyType;
                 if (index > 0)
                 {
-                    color = (new Color[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange, Color.DarkSlateBlue, Color.RoyalBlue })[index - 1];
-                    //color = ColorTranslator.FromHtml(new string[] { "#CC0066", "#CC6600", "#99CC99", "#666699" }[index - 1]);
+                    color = (new[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange, Color.DarkSlateBlue, Color.RoyalBlue })[index - 1];
                 }
 
                 int width = 128;
@@ -47,23 +92,10 @@ namespace v2rayN.Handler
                 Graphics graphics = Graphics.FromImage(bitmap);
                 SolidBrush drawBrush = new SolidBrush(color);
 
-                var customIcon = false;
-                if (config.enableRoutingAdvanced)
-                {
-                    var item = config.routings[config.routingIndex];
-                    if (!Utils.IsNullOrEmpty(item.customIcon) && File.Exists(item.customIcon))
-                    {
-                        graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));
+                graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                //graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));                
                 graphics.DrawImage(new Bitmap(item.customIcon), 0, 0, width, height);
-                        customIcon = true;
-                    }
-                }
-                if (!customIcon)
-                {
-                    graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
-                    int zoom = 16;
-                    graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
-                }
+                graphics.FillEllipse(drawBrush, width / 2, width / 2, width / 2, width / 2);
 
                 Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
 
@@ -76,7 +108,7 @@ namespace v2rayN.Handler
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
-                return def;
+                return null;
             }
         }
 
@@ -86,8 +118,7 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (item.configType != EConfigType.Vmess
-                && item.configType != EConfigType.VLESS)
+            if (item.configType == EConfigType.Custom)
             {
                 UI.Show(ResUI.NonVmessService);
                 return;
@@ -126,7 +157,7 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (item.configType != EConfigType.Vmess
+            if (item.configType != EConfigType.VMess
                 && item.configType != EConfigType.VLESS)
             {
                 UI.Show(ResUI.NonVmessService);

v2rayN/v2rayN/Handler/QRCodeHelper.cs

@@ -1,4 +1,5 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using ZXing;
 using ZXing.QrCode;
 
@@ -34,8 +35,9 @@ namespace v2rayN.Handler
                 img = (Image)bmp;
                 return img;
             }
-            catch
+            catch(Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 return img;
             }
         }

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -31,7 +31,7 @@ namespace v2rayN.Handler
 
                 switch (item.configType)
                 {
-                    case EConfigType.Vmess:
+                    case EConfigType.VMess:
                         url = ShareVmess(item);
                         break;
                     case EConfigType.Shadowsocks:
@@ -51,8 +51,9 @@ namespace v2rayN.Handler
                 }
                 return url;
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 return "";
             }
         }
@@ -81,7 +82,7 @@ namespace v2rayN.Handler
 
             url = Utils.ToJson(vmessQRCode);
             url = Utils.Base64Encode(url);
-            url = string.Format("{0}{1}", Global.vmessProtocol, url);
+            url = $"{Global.vmessProtocol}{url}";
 
             return url;
         }
@@ -104,7 +105,7 @@ namespace v2rayN.Handler
             //new Sip002
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{ item.port}";
-            url = string.Format("{0}{1}{2}", Global.ssProtocol, url, remark);
+            url = $"{Global.ssProtocol}{url}{remark}";
             return url;
         }
 
@@ -125,7 +126,7 @@ namespace v2rayN.Handler
             //new
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{ item.port}";
-            url = string.Format("{0}{1}{2}", Global.socksProtocol, url, remark);
+            url = $"{Global.socksProtocol}{url}{remark}";
             return url;
         }
 
@@ -145,7 +146,7 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = string.Format("{0}{1}{2}{3}", Global.trojanProtocol, url, query, remark);
+            url = $"{Global.trojanProtocol}{url}{query}{remark}";
             return url;
         }
 
@@ -173,7 +174,7 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = string.Format("{0}{1}{2}{3}", Global.vlessProtocol, url, query, remark);
+            url = $"{Global.vlessProtocol}{url}{query}{remark}";
             return url;
         }
         private static string GetIpv6(string address)
@@ -207,40 +208,20 @@ namespace v2rayN.Handler
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(Utils.List2String(item.alpn)));
             }
-            if (!Utils.IsNullOrEmpty(item.network))
-            {
-                dicQuery.Add("type", item.network);
-            }
-            else
-            {
-                dicQuery.Add("type", "tcp");
-            }
+
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
 
             switch (item.network)
             {
                 case "tcp":
-                    if (!Utils.IsNullOrEmpty(item.headerType))
-                    {
-                        dicQuery.Add("headerType", item.headerType);
-                    }
-                    else
-                    {
-                        dicQuery.Add("headerType", "none");
-                    }
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
                     break;
                 case "kcp":
-                    if (!Utils.IsNullOrEmpty(item.headerType))
-                    {
-                        dicQuery.Add("headerType", item.headerType);
-                    }
-                    else
-                    {
-                        dicQuery.Add("headerType", "none");
-                    }
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
                         dicQuery.Add("seed", Utils.UrlEncode(item.path));
@@ -272,14 +253,7 @@ namespace v2rayN.Handler
                     break;
 
                 case "quic":
-                    if (!Utils.IsNullOrEmpty(item.headerType))
-                    {
-                        dicQuery.Add("headerType", item.headerType);
-                    }
-                    else
-                    {
-                        dicQuery.Add("headerType", "none");
-                    }
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
                     dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
                     dicQuery.Add("key", Utils.UrlEncode(item.path));
                     break;
@@ -341,11 +315,7 @@ namespace v2rayN.Handler
                 {
                     msg = ResUI.ConfigurationFormatIncorrect;
 
-                    vmessItem = ResolveSSLegacy(result);
-                    if (vmessItem == null)
-                    {
-                        vmessItem = ResolveSip002(result);
-                    }
+                    vmessItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
                     if (vmessItem == null)
                     {
                         return null;
@@ -361,11 +331,7 @@ namespace v2rayN.Handler
                 {
                     msg = ResUI.ConfigurationFormatIncorrect;
 
-                    vmessItem = ResolveSocksNew(result);
-                    if (vmessItem == null)
-                    {
-                        vmessItem = ResolveSocks(result);
-                    }
+                    vmessItem = ResolveSocksNew(result) ?? ResolveSocks(result);
                     if (vmessItem == null)
                     {
                         return null;
@@ -395,8 +361,9 @@ namespace v2rayN.Handler
                     return null;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.Incorrectconfiguration;
                 return null;
             }
@@ -407,9 +374,11 @@ namespace v2rayN.Handler
         private static VmessItem ResolveVmess(string result, out string msg)
         {
             msg = string.Empty;
-            VmessItem vmessItem = new VmessItem();
+            var vmessItem = new VmessItem
+            {
+                configType = EConfigType.VMess
+            };
 
-            vmessItem.configType = EConfigType.Vmess;
             result = result.Substring(Global.vmessProtocol.Length);
             result = Utils.Base64Decode(result);
 
@@ -432,14 +401,7 @@ namespace v2rayN.Handler
             vmessItem.alterId = Utils.ToInt(vmessQRCode.aid);
             vmessItem.security = Utils.ToString(vmessQRCode.scy);
 
-            if (!Utils.IsNullOrEmpty(vmessQRCode.scy))
-            {
-                vmessItem.security = vmessQRCode.scy;
-            }
-            else
-            {
-                vmessItem.security = Global.DefaultSecurity;
-            }
+            vmessItem.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
             if (!Utils.IsNullOrEmpty(vmessQRCode.net))
             {
                 vmessItem.network = vmessQRCode.net;
@@ -462,7 +424,7 @@ namespace v2rayN.Handler
         {
             VmessItem vmessItem = new VmessItem
             {
-                configType = EConfigType.Vmess
+                configType = EConfigType.VMess
             };
             result = result.Substring(Global.vmessProtocol.Length);
             int indexSplit = result.IndexOf("?");
@@ -500,7 +462,7 @@ namespace v2rayN.Handler
         {
             VmessItem i = new VmessItem
             {
-                configType = EConfigType.Vmess,
+                configType = EConfigType.VMess,
                 security = "auto"
             };
 
@@ -594,23 +556,48 @@ namespace v2rayN.Handler
                 address = parsedUrl.IdnHost,
                 port = parsedUrl.Port,
             };
-
-            // parse base64 UserInfo
             string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
+            //2022-blake3
+            if (rawUserInfo.Contains(":"))
+            {
+                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+                if (userInfoParts.Length != 2)
+                {
+                    return null;
+                }
+                server.security = userInfoParts[0];
+                server.id = Utils.UrlDecode(userInfoParts[1]);
+            }
+            else
+            {
+                // parse base64 UserInfo
                 string userInfo = Utils.Base64Decode(rawUserInfo);
-            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
+                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
                 {
                     return null;
                 }
                 server.security = userInfoParts[0];
                 server.id = userInfoParts[1];
+            }
 
             NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
             if (queryParameters["plugin"] != null)
+            {
+                //obfs-host exists
+                var obfsHost = queryParameters["plugin"].Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
+                if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
+                {
+                    obfsHost = obfsHost.Replace("obfs-host=", "");
+                    server.network = Global.DefaultNetwork;
+                    server.headerType = Global.TcpHeaderHttp;
+                    server.requestHost = obfsHost;
+                }
+                else
                 {
                     return null;
                 }
+            }
 
             return server;
         }
@@ -655,8 +642,10 @@ namespace v2rayN.Handler
 
         private static VmessItem ResolveSocks(string result)
         {
-            VmessItem vmessItem = new VmessItem();
-            vmessItem.configType = EConfigType.Socks;
+            VmessItem vmessItem = new VmessItem
+            {
+                configType = EConfigType.Socks
+            };
             result = result.Substring(Global.socksProtocol.Length);
             //remark
             int indexRemark = result.IndexOf("#");
@@ -720,7 +709,7 @@ namespace v2rayN.Handler
             // parse base64 UserInfo
             string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
             string userInfo = Utils.Base64Decode(rawUserInfo);
-            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
+            string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length == 2)
             {
                 server.security = userInfoParts[0];

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -43,19 +44,19 @@ namespace v2rayN.Handler
 
             if (actionType == ESpeedActionType.Ping)
             {
-                Task.Run(() => RunPing());
+                Task.Run(RunPing);
             }
             else if (actionType == ESpeedActionType.Tcping)
             {
-                Task.Run(() => RunTcping());
+                Task.Run(RunTcping);
             }
             else if (actionType == ESpeedActionType.Realping)
             {
-                Task.Run(() => RunRealPing());
+                Task.Run(RunRealPing);
             }
             else if (actionType == ESpeedActionType.Speedtest)
             {
-                Task.Run(() => RunSpeedTestAsync());
+                Task.Run(RunSpeedTestAsync);
             }
         }
 
@@ -63,12 +64,8 @@ namespace v2rayN.Handler
         {
             try
             {
-                foreach (var it in _selecteds)
+                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
                 {
-                    if (it.configType == EConfigType.Custom)
-                    {
-                        continue;
-                    }
                     try
                     {
                         Task.Run(() => updateFun(it));
@@ -252,7 +249,7 @@ namespace v2rayN.Handler
             {
                 return "Timeout";
             }
-            return string.Format("{0}{1}", time, unit).PadLeft(8, ' ');
+            return $"{time}{unit}".PadLeft(8, ' ');
         }
     }
 }

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -31,13 +31,7 @@ namespace v2rayN.Handler
         }
 
 
-        public List<ServerStatItem> Statistic
-        {
-            get
-            {
-                return serverStatistics_.server;
-            }
-        }
+        public List<ServerStatItem> Statistic => serverStatistics_.server;
 
         public StatisticsHandler(Mode.Config config, Action<ulong, ulong, List<ServerStatItem>> update)
         {
@@ -68,7 +62,7 @@ namespace v2rayN.Handler
 
             GrpcInit();
 
-            Task.Run(() => Run());
+            Task.Run(Run);
         }
 
         private void GrpcInit()
@@ -133,7 +127,7 @@ namespace v2rayN.Handler
                             }
                         }
                     }
-                    Thread.Sleep(config_.statisticsFreshRate);
+                    Thread.Sleep(1000 * config_.statisticsFreshRate);
                     channel_.ConnectAsync();
                 }
                 catch (Exception ex)

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -60,6 +60,7 @@ namespace v2rayN.Handler
             try
             {
                 int port = config.GetLocalPort(Global.InboundHttp);
+                int portSocks = config.GetLocalPort(Global.InboundSocks);
                 if (port <= 0)
                 {
                     return false;
@@ -67,7 +68,20 @@ namespace v2rayN.Handler
                 if (type == ESysProxyType.ForcedChange)
                 {
                     var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
-                    SetIEProxy(true, $"{Global.Loopback}:{port}", strExceptions);
+
+                    var strProxy = string.Empty;
+                    if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
+                    {
+                        strProxy = $"{Global.Loopback}:{port}";
+                    }
+                    else
+                    {
+                        strProxy = config.systemProxyAdvancedProtocol
+                            .Replace("{ip}", Global.Loopback)
+                            .Replace("{http_port}", port.ToString())
+                            .Replace("{socks_port}", portSocks.ToString());
+                    }
+                    SetIEProxy(true, strProxy, strExceptions);
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
@@ -96,41 +110,6 @@ namespace v2rayN.Handler
             }
         }
 
-        public static void SetIEProxy(bool enable, bool global, string strProxy)
-        {
-            //Read();
-
-            //if (!_userSettings.UserSettingsRecorded)
-            //{
-            //    // record user settings
-            //    ExecSysproxy("query");
-            //    //ParseQueryStr(_queryStr);
-            //}
-
-            string arguments;
-            if (enable)
-            {
-                arguments = global
-                    ? $"global {strProxy} {Global.IEProxyExceptions}"
-                    : $"pac {strProxy}";
-            }
-            else
-            {
-                // restore user settings
-                string flags = _userSettings.Flags;
-                string proxy_server = _userSettings.ProxyServer ?? "-";
-                string bypass_list = _userSettings.BypassList ?? "-";
-                string pac_url = _userSettings.PacUrl ?? "-";
-                arguments = $"set {flags} {proxy_server} {bypass_list} {pac_url}";
-
-                // have to get new settings
-                _userSettings.UserSettingsRecorded = false;
-            }
-
-            //Save();
-            ExecSysproxy(arguments);
-        }
-
 
         public static void SetIEProxy(bool global, string strProxy, string strExceptions)
         {

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using v2rayN.Base;
@@ -25,19 +26,11 @@ namespace v2rayN.Handler
 
             public ResultEventArgs(bool success, string msg)
             {
-                this.Success = success;
-                this.Msg = msg;
+                Success = success;
+                Msg = msg;
             }
         }
 
-        private readonly string nLatestUrl = Global.NUrl + "/latest";
-        private const string nUrl = Global.NUrl + "/download/{0}/v2rayN.zip";
-        private readonly string v2flyCoreLatestUrl = Global.v2flyCoreUrl + "/latest";
-        private const string v2flyCoreUrl = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip";
-        private readonly string xrayCoreLatestUrl = Global.xrayCoreUrl + "/latest";
-        private const string xrayCoreUrl = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip";
-        private const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-
         public void CheckUpdateGuiN(Config config, Action<bool, string> update)
         {
             _config = config;
@@ -178,6 +171,16 @@ namespace v2rayN.Handler
 
             Task.Run(async () =>
             {
+                //Turn off system proxy
+                bool bSysProxyType = false;
+                if (!blProxy && config.sysProxyType == ESysProxyType.ForcedChange)
+                {
+                    bSysProxyType = true;
+                    config.sysProxyType = ESysProxyType.ForcedClear;
+                    SysProxyHandle.UpdateSysProxy(config, false);
+                    Thread.Sleep(3000);
+                }
+
                 foreach (var item in config.subItem)
                 {
                     if (item.enabled == false)
@@ -195,29 +198,47 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-                    var result = await (new DownloadHandle()).DownloadStringAsync(url, blProxy, userAgent);
+                    var downloadHandle = new DownloadHandle();
+                    downloadHandle.Error += (sender2, args) =>
+                    {
+                        _updateFunc(false, $"{hashCode}{args.GetException().Message}");
+                    };
+
+                    _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+                    var result = await downloadHandle.DownloadStringAsync(url, blProxy, userAgent);
+                    if (blProxy && Utils.IsNullOrEmpty(result))
+                    {
+                        result = await downloadHandle.DownloadStringAsync(url, false, userAgent);
+                    }
 
-                    _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
                     if (Utils.IsNullOrEmpty(result))
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
                     }
                     else
                     {
+                        _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+                        if (result.Length < 99)
+                        {
+                            _updateFunc(false, $"{hashCode}{result}");
+                        }
+
                         int ret = ConfigHandler.AddBatchServers(ref config, result, id, groupId);
-                        if (ret > 0)
+                        _updateFunc(false,
+                            ret > 0
+                                ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
+                                : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+                    }
+                    _updateFunc(false, "-------------------------------------------------------");
+                }
+                //restore system proxy
+                if (bSysProxyType)
                 {
-                            _updateFunc(false, $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}");
-                        }
-                        else
-                        {
-                            _updateFunc(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-                        }
-                    }
-                    _updateFunc(false, $"-------------------------------------------------------");
+                    config.sysProxyType = ESysProxyType.ForcedChange;
+                    SysProxyHandle.UpdateSysProxy(config, false);
                 }
                 _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
+
             });
         }
 
@@ -226,7 +247,7 @@ namespace v2rayN.Handler
         {
             _config = config;
             _updateFunc = update;
-            var url = string.Format(geoUrl, geoName);
+            var url = string.Format(Global.geoUrl, geoName);
 
             DownloadHandle downloadHandle = null;
             if (downloadHandle == null)
@@ -288,23 +309,8 @@ namespace v2rayN.Handler
         {
             try
             {
-                string url;
-                if (type == ECoreType.v2fly)
-                {
-                    url = v2flyCoreLatestUrl;
-                }
-                else if (type == ECoreType.Xray)
-                {
-                    url = xrayCoreLatestUrl;
-                }
-                else if (type == ECoreType.v2rayN)
-                {
-                    url = nLatestUrl;
-                }
-                else
-                {
-                    throw new ArgumentException("Type");
-                }
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+                string url = coreInfo.coreLatestUrl;
 
                 var result = await (new DownloadHandle()).UrlRedirectAsync(url, true);
                 if (!Utils.IsNullOrEmpty(result))
@@ -336,7 +342,7 @@ namespace v2rayN.Handler
                 string filePath = string.Empty;
                 foreach (string name in coreInfo.coreExes)
                 {
-                    string vName = string.Format("{0}.exe", name);
+                    string vName = $"{name}.exe";
                     vName = Utils.GetPath(vName);
                     if (File.Exists(vName))
                     {
@@ -378,32 +384,45 @@ namespace v2rayN.Handler
             try
             {
                 string version = redirectUrl.Substring(redirectUrl.LastIndexOf("/", StringComparison.Ordinal) + 1);
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
                 string curVersion;
                 string message;
                 string url;
-                if (type == ECoreType.v2fly)
+                switch (type)
+                {
+                    case ECoreType.v2fly:
+                    case ECoreType.Xray:
                         {
                             curVersion = "v" + getCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, curVersion);
                             string osBit = Environment.Is64BitProcess ? "64" : "32";
-                    url = string.Format(v2flyCoreUrl, version, osBit);
+                            url = string.Format(coreInfo.coreDownloadUrl64, version, osBit);
+                            break;
                         }
-                else if (type == ECoreType.Xray)
+                    case ECoreType.clash:
+                    case ECoreType.clash_meta:
                         {
-                    curVersion = "v" + getCoreVersion(type);
+                            curVersion = "";//getCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, curVersion);
-                    string osBit = Environment.Is64BitProcess ? "64" : "32";
-                    url = string.Format(xrayCoreUrl, version, osBit);
-                }
-                else if (type == ECoreType.v2rayN)
+                            if (Environment.Is64BitProcess)
                             {
-                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
-                    message = string.Format(ResUI.IsLatestN, curVersion);
-                    url = string.Format(nUrl, version);
+                                url = string.Format(coreInfo.coreDownloadUrl64, version);
                             }
                             else
                             {
+                                url = string.Format(coreInfo.coreDownloadUrl32, version);
+                            }
+                            break;
+                        }
+                    case ECoreType.v2rayN:
+                        {
+                            curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
+                            message = string.Format(ResUI.IsLatestN, curVersion);
+                            url = string.Format(coreInfo.coreDownloadUrl64, version);
+                            break;
+                        }
+                    default:
                         throw new ArgumentException("Type");
                 }
 

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -27,8 +27,9 @@ namespace v2rayN.Handler
         /// <param name="fileName"></param>
         /// <param name="msg"></param>
         /// <returns></returns>
-        public static int GenerateClientConfig(VmessItem node, string fileName, bool blExport, out string msg)
+        public static int GenerateClientConfig(VmessItem node, string fileName, out string msg, out string content)
         {
+            content = string.Empty;
             try
             {
                 if (node == null)
@@ -42,55 +43,34 @@ namespace v2rayN.Handler
                 {
                     return GenerateClientCustomConfig(node, fileName, out msg);
                 }
-
-                //取得默认配置
-                string result = Utils.GetEmbedText(SampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                else
+                {
+                    V2rayConfig v2rayConfig = null;
+                    if (GenerateClientConfigContent(node, false, ref v2rayConfig, out msg) != 0)
                     {
-                    msg = ResUI.FailedGetDefaultConfiguration;
                         return -1;
                     }
-
-                //转成Json
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
-                if (v2rayConfig == null)
+                    if (Utils.IsNullOrEmpty(fileName))
                     {
-                    msg = ResUI.FailedGenDefaultConfiguration;
-                    return -1;
+                        content = Utils.ToJson(v2rayConfig);
                     }
-
-                var config = LazyConfig.Instance.GetConfig();
-
-                //开始修改配置
-                log(config, ref v2rayConfig, blExport);
-
-                //本地端口
-                inbound(config, ref v2rayConfig);
-
-                //路由
-                routing(config, ref v2rayConfig);
-
-                //outbound
-                outbound(node, ref v2rayConfig);
-
-                //dns
-                dns(config, ref v2rayConfig);
-
-                // TODO: 统计配置
-                statistic(config, ref v2rayConfig);
-
+                    else
+                    {
                         Utils.ToJsonFile(v2rayConfig, fileName, false);
-
-                msg = string.Format(ResUI.SuccessfulConfiguration, $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
                     }
-            catch
+                }
+            }
+            catch (Exception ex)
             {
+                Utils.SaveLog("GenerateClientConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
             return 0;
         }
 
+
+
         /// <summary>
         /// 日志
         /// </summary>
@@ -130,8 +110,9 @@ namespace v2rayN.Handler
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -176,8 +157,9 @@ namespace v2rayN.Handler
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -246,8 +228,9 @@ namespace v2rayN.Handler
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -345,8 +328,9 @@ namespace v2rayN.Handler
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -363,7 +347,7 @@ namespace v2rayN.Handler
             {
                 var config = LazyConfig.Instance.GetConfig();
                 Outbounds outbound = v2rayConfig.outbounds[0];
-                if (node.configType == EConfigType.Vmess)
+                if (node.configType == EConfigType.VMess)
                 {
                     VnextItem vnextItem;
                     if (outbound.settings.vnext.Count <= 0)
@@ -406,9 +390,7 @@ namespace v2rayN.Handler
                     outbound.mux.enabled = config.muxEnabled;
                     outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
 
-                    //远程服务器底层传输配置
-                    StreamSettings streamSettings = outbound.streamSettings;
-                    boundStreamSettings(node, "out", ref streamSettings);
+                    boundStreamSettings(node, "out", outbound.streamSettings);
 
                     outbound.protocol = Global.vmessProtocolLite;
                     outbound.settings.servers = null;
@@ -429,14 +411,7 @@ namespace v2rayN.Handler
                     serversItem.address = node.address;
                     serversItem.port = node.port;
                     serversItem.password = node.id;
-                    if (LazyConfig.Instance.GetShadowsocksSecuritys().Contains(node.security))
-                    {
-                        serversItem.method = node.security;
-                    }
-                    else
-                    {
-                        serversItem.method = "none";
-                    }
+                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecuritys().Contains(node.security) ? node.security : "none";
 
 
                     serversItem.ota = false;
@@ -445,6 +420,7 @@ namespace v2rayN.Handler
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
 
+                    boundStreamSettings(node, "out", outbound.streamSettings);
 
                     outbound.protocol = Global.ssProtocolLite;
                     outbound.settings.vnext = null;
@@ -522,9 +498,7 @@ namespace v2rayN.Handler
                     outbound.mux.enabled = config.muxEnabled;
                     outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
 
-                    //远程服务器底层传输配置
-                    StreamSettings streamSettings = outbound.streamSettings;
-                    boundStreamSettings(node, "out", ref streamSettings);
+                    boundStreamSettings(node, "out", outbound.streamSettings);
 
                     //if xtls
                     if (node.streamSecurity == Global.StreamSecurityX)
@@ -585,34 +559,32 @@ namespace v2rayN.Handler
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
 
-
-                    //远程服务器底层传输配置
-                    StreamSettings streamSettings = outbound.streamSettings;
-                    boundStreamSettings(node, "out", ref streamSettings);
+                    boundStreamSettings(node, "out", outbound.streamSettings);
 
                     outbound.protocol = Global.trojanProtocolLite;
                     outbound.settings.vnext = null;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
         /// <summary>
-        /// vmess协议远程服务器底层传输配置
+        /// 底层传输配置
         /// </summary>
         /// <param name="node"></param>
         /// <param name="iobound"></param>
         /// <param name="streamSettings"></param>
         /// <returns></returns>
-        private static int boundStreamSettings(VmessItem node, string iobound, ref StreamSettings streamSettings)
+        private static int boundStreamSettings(VmessItem node, string iobound, StreamSettings streamSettings)
         {
             try
             {
                 var config = LazyConfig.Instance.GetConfig();
-                //远程服务器底层传输配置
+
                 streamSettings.network = node.GetNetwork();
                 string host = node.requestHost.TrimEx();
                 string sni = node.sni;
@@ -767,10 +739,12 @@ namespace v2rayN.Handler
                         }
                         break;
                     case "grpc":
-                        var grpcSettings = new GrpcSettings();
+                        var grpcSettings = new GrpcSettings
+                        {
+                            serviceName = node.path,
+                            multiMode = (node.headerType == Global.GrpcmultiMode)
+                        };
 
-                        grpcSettings.serviceName = node.path;
-                        grpcSettings.multiMode = (node.headerType == Global.GrpcmultiMode ? true : false);
                         streamSettings.grpcSettings = grpcSettings;
                         break;
                     default:
@@ -791,7 +765,7 @@ namespace v2rayN.Handler
                                 string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
                                 string[] arrHost = host.Split(',');
                                 string host2 = string.Join("\",\"", arrHost);
-                                request = request.Replace("$requestHost$", string.Format("\"{0}\"", host2));
+                                request = request.Replace("$requestHost$", $"\"{host2}\"");
                                 //request = request.Replace("$requestHost$", string.Format("\"{0}\"", config.requestHost()));
 
                                 //填入自定义Path
@@ -801,7 +775,7 @@ namespace v2rayN.Handler
                                     string[] arrPath = node.path.Split(',');
                                     pathHttp = string.Join("\",\"", arrPath);
                                 }
-                                request = request.Replace("$requestPath$", string.Format("\"{0}\"", pathHttp));
+                                request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
                                 tcpSettings.header.request = Utils.FromJson<object>(request);
                             }
                             else if (iobound.Equals("in"))
@@ -815,8 +789,9 @@ namespace v2rayN.Handler
                         break;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -836,6 +811,14 @@ namespace v2rayN.Handler
                     return 0;
                 }
 
+                //Outbound Freedom domainStrategy
+                if (!string.IsNullOrWhiteSpace(config.domainStrategy4Freedom))
+                {
+                    var outbound = v2rayConfig.outbounds[1];
+                    outbound.settings.domainStrategy = config.domainStrategy4Freedom;
+                    outbound.settings.userLevel = 0;
+                }
+
                 var obj = Utils.ParseJson(config.remoteDNS);
                 if (obj != null && obj.ContainsKey("servers"))
                 {
@@ -860,8 +843,9 @@ namespace v2rayN.Handler
                     };
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -888,7 +872,7 @@ namespace v2rayN.Handler
                 policyObj.system = policySystemSetting;
                 v2rayConfig.policy = policyObj;
 
-                if (!v2rayConfig.inbounds.Exists(item => { return item.tag == tag; }))
+                if (!v2rayConfig.inbounds.Exists(item => item.tag == tag))
                 {
                     Inbounds apiInbound = new Inbounds();
                     Inboundsettings apiInboundSettings = new Inboundsettings();
@@ -901,7 +885,7 @@ namespace v2rayN.Handler
                     v2rayConfig.inbounds.Add(apiInbound);
                 }
 
-                if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; }))
+                if (!v2rayConfig.routing.rules.Exists(item => item.outboundTag == tag))
                 {
                     RulesItem apiRoutingRule = new RulesItem
                     {
@@ -941,7 +925,7 @@ namespace v2rayN.Handler
                 string addressFileName = node.address;
                 if (!File.Exists(addressFileName))
                 {
-                    addressFileName = Path.Combine(Utils.GetConfigPath(), addressFileName);
+                    addressFileName = Utils.GetConfigPath(addressFileName);
                 }
                 if (!File.Exists(addressFileName))
                 {
@@ -958,6 +942,8 @@ namespace v2rayN.Handler
                 }
 
                 //overwrite port
+                if (node.preSocksPort <= 0)
+                {
                     var fileContent = File.ReadAllLines(fileName).ToList();
                     var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
                     switch (coreType)
@@ -967,13 +953,27 @@ namespace v2rayN.Handler
                             break;
                         case ECoreType.clash:
                         case ECoreType.clash_meta:
+                            //remove the original 
+                            var indexPort = fileContent.FindIndex(t => t.Contains("port:"));
+                            if (indexPort >= 0)
+                            {
+                                fileContent.RemoveAt(indexPort);
+                            }
+                            indexPort = fileContent.FindIndex(t => t.Contains("socks-port:"));
+                            if (indexPort >= 0)
+                            {
+                                fileContent.RemoveAt(indexPort);
+                            }
+
                             fileContent.Add($"port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundHttp)}");
                             fileContent.Add($"socks-port: {LazyConfig.Instance.GetConfig().GetLocalPort(Global.InboundSocks)}");
                             break;
                     }
                     File.WriteAllLines(fileName, fileContent);
+                }
 
-                msg = string.Format(ResUI.SuccessfulConfiguration, $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
+                //msg = string.Format(ResUI.SuccessfulConfiguration, $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
+                msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
             catch (Exception ex)
             {
@@ -984,6 +984,66 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        public static int GenerateClientConfigContent(VmessItem node, bool blExport, ref V2rayConfig v2rayConfig, out string msg)
+        {
+            try
+            {
+                if (node == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                //取得默认配置
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                //转成Json
+                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+
+                var config = LazyConfig.Instance.GetConfig();
+
+                //开始修改配置
+                log(config, ref v2rayConfig, blExport);
+
+                //本地端口
+                inbound(config, ref v2rayConfig);
+
+                //路由
+                routing(config, ref v2rayConfig);
+
+                //outbound
+                outbound(node, ref v2rayConfig);
+
+                //dns
+                dns(config, ref v2rayConfig);
+
+                //stat
+                statistic(config, ref v2rayConfig);
+
+                //msg = string.Format(ResUI.SuccessfulConfiguration, $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}");
+                msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("GenerateClientConfig", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
         #endregion
 
         #region 生成服务端端配置
@@ -1039,8 +1099,9 @@ namespace v2rayN.Handler
 
                 msg = string.Format(ResUI.SuccessfulConfiguration, node.GetSummary());
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -1075,7 +1136,7 @@ namespace v2rayN.Handler
                 usersItem.id = node.id;
                 usersItem.email = Global.userEMail;
 
-                if (node.configType == EConfigType.Vmess)
+                if (node.configType == EConfigType.VMess)
                 {
                     inbound.protocol = Global.vmessProtocolLite;
                     usersItem.alterId = node.alterId;
@@ -1088,12 +1149,11 @@ namespace v2rayN.Handler
                     inbound.settings.decryption = node.security;
                 }
 
-                //远程服务器底层传输配置
-                StreamSettings streamSettings = inbound.streamSettings;
-                boundStreamSettings(node, "in", ref streamSettings);
+                boundStreamSettings(node, "in", inbound.streamSettings);
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -1113,8 +1173,9 @@ namespace v2rayN.Handler
                     v2rayConfig.outbounds[0].settings = null;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
             }
             return 0;
         }
@@ -1179,7 +1240,7 @@ namespace v2rayN.Handler
                 vmessItem.port = outbound.settings.vnext[0].port;
                 vmessItem.id = outbound.settings.vnext[0].users[0].id;
                 vmessItem.alterId = outbound.settings.vnext[0].users[0].alterId;
-                vmessItem.remarks = string.Format("import@{0}", DateTime.Now.ToShortDateString());
+                vmessItem.remarks = $"import@{DateTime.Now.ToShortDateString()}";
 
                 //tcp or kcp
                 if (outbound.streamSettings != null
@@ -1259,8 +1320,9 @@ namespace v2rayN.Handler
                     vmessItem.streamSecurity = Global.StreamSecurity;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.IncorrectClientConfiguration;
                 return null;
             }
@@ -1324,7 +1386,7 @@ namespace v2rayN.Handler
                 vmessItem.id = inbound.settings.clients[0].id;
                 vmessItem.alterId = inbound.settings.clients[0].alterId;
 
-                vmessItem.remarks = string.Format("import@{0}", DateTime.Now.ToShortDateString());
+                vmessItem.remarks = $"import@{DateTime.Now.ToShortDateString()}";
 
                 //tcp or kcp
                 if (inbound.streamSettings != null
@@ -1404,8 +1466,9 @@ namespace v2rayN.Handler
                     vmessItem.streamSecurity = Global.StreamSecurity;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.IncorrectClientConfiguration;
                 return null;
             }
@@ -1421,7 +1484,12 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int Export2ClientConfig(VmessItem node, string fileName, out string msg)
         {
-            return GenerateClientConfig(node, fileName, true, out msg);
+            V2rayConfig v2rayConfig = null;
+            if (GenerateClientConfigContent(node, true, ref v2rayConfig, out msg) != 0)
+            {
+                return -1;
+            }
+            return Utils.ToJsonFile(v2rayConfig, fileName, false);
         }
 
         /// <summary>
@@ -1468,12 +1536,18 @@ namespace v2rayN.Handler
                     msg = ResUI.FailedGenDefaultConfiguration;
                     return "";
                 }
-                List<IPEndPoint> lstIpEndPoints = null;
+                List<IPEndPoint> lstIpEndPoints = new List<IPEndPoint>();
+                List<TcpConnectionInformation> lstTcpConns = new List<TcpConnectionInformation>();
                 try
                 {
-                    lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                    lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
                 }
-                catch { }
 
                 log(configCopy, ref v2rayConfig, false);
                 //routing(config, ref v2rayConfig);
@@ -1493,7 +1567,7 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
-                    if (it.configType == EConfigType.Vmess || it.configType == EConfigType.VLESS)
+                    if (it.configType == EConfigType.VMess || it.configType == EConfigType.VLESS)
                     {
                         if (!Utils.IsGuidByParse(configCopy.GetVmessItem(it.indexId).id))
                         {
@@ -1509,6 +1583,10 @@ namespace v2rayN.Handler
                         {
                             continue;
                         }
+                        if (lstTcpConns != null && lstTcpConns.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                        {
+                            continue;
+                        }
                         //found
                         port = k;
                         httpPort = port + 1;
@@ -1549,8 +1627,9 @@ namespace v2rayN.Handler
                 //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
                 return Utils.ToJson(v2rayConfig);
             }
-            catch
+            catch (Exception ex)
             {
+                Utils.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return "";
             }

v2rayN/v2rayN/Handler/V2rayHandler.cs

@@ -24,7 +24,7 @@ namespace v2rayN.Handler
         private static string v2rayConfigRes = Global.v2rayConfigFileName;
         private CoreInfo coreInfo;
         public event ProcessDelegate ProcessEvent;
-        //private int processId = 0;
+        private int processId = 0;
         private Process _process;
 
         public V2rayHandler()
@@ -51,15 +51,31 @@ namespace v2rayN.Handler
                     return;
                 }
                 string fileName = Utils.GetPath(v2rayConfigRes);
-                if (V2rayConfigHandler.GenerateClientConfig(item, fileName, false, out string msg) != 0)
+                if (V2rayConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
                 {
                     ShowMsg(false, msg);
                 }
                 else
                 {
-                    ShowMsg(true, msg);
+                    ShowMsg(false, msg);
+                    ShowMsg(true, $"[{config.GetGroupRemarks(item.groupId)}] {item.GetSummary()}");
                     V2rayRestart();
                 }
+
+                //start a socks service
+                if (item.configType == EConfigType.Custom && item.preSocksPort > 0)
+                {
+                    var itemSocks = new VmessItem()
+                    {
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        port = item.preSocksPort
+                    };
+                    if (V2rayConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
+                    {
+                        processId = V2rayStartNew(configStr);
+                    }
+                }
             }
         }
 
@@ -127,27 +143,12 @@ namespace v2rayN.Handler
                     }
                 }
 
-                //bool blExist = true;
-                //if (processId > 0)
-                //{
-                //    Process p1 = Process.GetProcessById(processId);
-                //    if (p1 != null)
-                //    {
-                //        p1.Kill();
-                //        blExist = false;
-                //    }
-                //}
-                //if (blExist)
-                //{
-                //    foreach (string vName in lstV2ray)
-                //    {
-                //        Process[] killPro = Process.GetProcessesByName(vName);
-                //        foreach (Process p in killPro)
-                //        {
-                //            p.Kill();
-                //        }
-                //    }
-                //}
+                if (processId > 0)
+                {
+                    V2rayStopPid(processId);
+                    processId = 0;
+                }
+
             }
             catch (Exception ex)
             {
@@ -175,7 +176,7 @@ namespace v2rayN.Handler
             string fileName = string.Empty;
             foreach (string name in lstCoreTemp)
             {
-                string vName = string.Format("{0}.exe", name);
+                string vName = $"{name}.exe";
                 vName = Utils.GetPath(vName);
                 if (File.Exists(vName))
                 {
@@ -214,21 +215,21 @@ namespace v2rayN.Handler
                         RedirectStandardOutput = true,
                         RedirectStandardError = true,
                         CreateNoWindow = true,
-                        StandardOutputEncoding = Encoding.UTF8
+                        StandardOutputEncoding = Encoding.UTF8,
+                        StandardErrorEncoding = Encoding.UTF8
                     }
                 };
-                p.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
+                p.OutputDataReceived += (sender, e) =>
                 {
                     if (!String.IsNullOrEmpty(e.Data))
                     {
                         string msg = e.Data + Environment.NewLine;
                         ShowMsg(false, msg);
                     }
-                });
+                };
                 p.Start();
                 p.PriorityClass = ProcessPriorityClass.High;
                 p.BeginOutputReadLine();
-                //processId = p.Id;
                 _process = p;
 
                 if (p.WaitForExit(1000))
@@ -254,7 +255,7 @@ namespace v2rayN.Handler
 
             try
             {
-                string fileName = V2rayFindexe(new List<string> { "xray" });
+                string fileName = V2rayFindexe(new List<string> { "xray", "wv2ray", "v2ray" });
                 if (fileName == "") return -1;
 
                 Process p = new Process
@@ -269,17 +270,18 @@ namespace v2rayN.Handler
                         RedirectStandardOutput = true,
                         RedirectStandardError = true,
                         CreateNoWindow = true,
-                        StandardOutputEncoding = Encoding.UTF8
+                        StandardOutputEncoding = Encoding.UTF8,
+                        StandardErrorEncoding = Encoding.UTF8
                     }
                 };
-                p.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
+                p.OutputDataReceived += (sender, e) =>
                 {
                     if (!String.IsNullOrEmpty(e.Data))
                     {
                         string msg = e.Data + Environment.NewLine;
                         ShowMsg(false, msg);
                     }
-                });
+                };
                 p.Start();
                 p.BeginOutputReadLine();
 

v2rayN/v2rayN/Mode/Config.cs

@@ -84,6 +84,14 @@ namespace v2rayN.Mode
             get; set;
         }
 
+        /// <summary>
+        /// Outbound Freedom domainStrategy
+        /// </summary>
+        public string domainStrategy4Freedom
+        {
+            get; set;
+        }
+
         /// <summary>
         /// 是否允许不安全连接
         /// </summary>
@@ -124,6 +132,7 @@ namespace v2rayN.Mode
         {
             get; set;
         }
+        public string systemProxyAdvancedProtocol { get; set; }
         
         public int autoUpdateInterval { get; set; } = 0;
 
@@ -281,7 +290,7 @@ namespace v2rayN.Mode
         public VmessItem()
         {
             indexId = string.Empty;
-            configType = EConfigType.Vmess;
+            configType = EConfigType.VMess;
             configVersion = 2;
             sort = 0;
             address = string.Empty;
@@ -322,7 +331,7 @@ namespace v2rayN.Mode
             }
             switch (configType)
             {
-                case EConfigType.Vmess:
+                case EConfigType.VMess:
                 case EConfigType.Shadowsocks:
                 case EConfigType.Socks:
                 case EConfigType.VLESS:
@@ -552,10 +561,16 @@ namespace v2rayN.Mode
         {
             get; set;
         } = string.Empty;
+
         public ECoreType? coreType
         {
             get; set;
         }
+
+        public int preSocksPort
+        {
+            get; set;
+        }
     }
 
     [Serializable]

v2rayN/v2rayN/Mode/CoreInfo.cs

@@ -14,6 +14,12 @@ namespace v2rayN.Mode
 
         public string coreUrl { get; set; }
 
+        public string coreLatestUrl { get; set; }
+
+        public string coreDownloadUrl32 { get; set; }
+
+        public string coreDownloadUrl64 { get; set; }
+
         public string match { get; set; }
     }
 }

v2rayN/v2rayN/Mode/EConfigType.cs

@@ -3,7 +3,7 @@ namespace v2rayN.Mode
 {
     public enum EConfigType
     {
-        Vmess = 1,
+        VMess = 1,
         Custom = 2,
         Shadowsocks = 3,
         Socks = 4,

v2rayN/v2rayN/Mode/ECoreType.cs

@@ -9,6 +9,7 @@ namespace v2rayN.Mode
         clash_meta = 12,
         hysteria = 21,
         naiveproxy = 22,
+        tuic = 23,
         v2rayN = 99
     }
 }

v2rayN/v2rayN/Mode/SsSIP008.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace v2rayN.Mode
+{
+    public class SsSIP008
+    {
+        public List<SsServer> servers { get; set; }
+    }
+
+    [Serializable]
+    public class SsServer
+    {
+        public string remarks { get; set; }
+        public string server { get; set; }
+        public string server_port { get; set; }
+        public string method { get; set; }
+        public string password { get; set; }
+        public string plugin { get; set; }
+    }
+
+}

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -224,6 +224,16 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public Response response { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string domainStrategy { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? userLevel { get; set; }
     }
 
     public class VnextItem

v2rayN/v2rayN/Program.cs

@@ -1,18 +1,13 @@
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
 using v2rayN.Forms;
-using v2rayN.Properties;
 using v2rayN.Tool;
 
 namespace v2rayN
 {
     static class Program
     {
-        [System.Runtime.InteropServices.DllImport("user32.dll")]
-        private static extern bool SetProcessDPIAware();
-
         /// <summary>
         /// 应用程序的主入口点。
         /// </summary>
@@ -21,12 +16,12 @@ namespace v2rayN
         {
             if (Environment.OSVersion.Version.Major >= 6)
             {
-                SetProcessDPIAware();
+                Utils.SetProcessDPIAware();
             }
 
             Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
-            Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
-            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+            Application.ThreadException += Application_ThreadException;
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
 
             //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
@@ -47,6 +42,22 @@ namespace v2rayN
             }
             else
             {
+                try
+                {
+                    //read handle from reg and show the window
+                    long.TryParse(Utils.RegReadValue(Global.MyRegPath, Utils.WindowHwndKey, ""), out long llong);
+                    if (llong > 0)
+                    {
+                        var hwnd = (IntPtr)llong;
+                        if (Utils.IsWindow(hwnd))
+                        {
+                            Utils.ShowWindow(hwnd, 4);
+                            Utils.SwitchToThisWindow(hwnd, true);
+                            return;
+                        }
+                    }
+                }
+                catch { }
                 UI.ShowWarning($"v2rayN is already running(v2rayN已经运行)");
             }
         }

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("5.17")]
+[assembly: AssemblyFileVersion("5.30")]

v2rayN/v2rayN/Properties/Resources.Designer.cs

@@ -110,6 +110,36 @@ namespace v2rayN.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Icon NotifyIcon1 {
+            get {
+                object obj = ResourceManager.GetObject("NotifyIcon1", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Icon NotifyIcon2 {
+            get {
+                object obj = ResourceManager.GetObject("NotifyIcon2", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Icon NotifyIcon3 {
+            get {
+                object obj = ResourceManager.GetObject("NotifyIcon3", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

v2rayN/v2rayN/Properties/Resources.resx

@@ -157,4 +157,13 @@
   <data name="share" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="NotifyIcon1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NotifyIcon1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NotifyIcon2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NotifyIcon2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NotifyIcon3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NotifyIcon3.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -106,7 +106,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  configuration format is incorrect 的本地化字符串。
+        ///   查找类似 Invalid configuration format 的本地化字符串。
         /// </summary>
         internal static string ConfigurationFormatIncorrect {
             get {
@@ -133,7 +133,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 DOWN 的本地化字符串。
+        ///   查找类似 Download 的本地化字符串。
         /// </summary>
         internal static string downloadSpeed {
             get {
@@ -439,7 +439,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Today download traffic 的本地化字符串。
+        ///   查找类似 Download traffic today 的本地化字符串。
         /// </summary>
         internal static string LvTodayDownloadDataAmount {
             get {
@@ -448,7 +448,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Today upload traffic 的本地化字符串。
+        ///   查找类似 Upload traffic today 的本地化字符串。
         /// </summary>
         internal static string LvTodayUploadDataAmount {
             get {
@@ -493,7 +493,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 MediumFresh 的本地化字符串。
+        ///   查找类似 Medium 的本地化字符串。
         /// </summary>
         internal static string MediumFresh {
             get {
@@ -538,7 +538,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Get the subscription content successfully 的本地化字符串。
+        ///   查找类似 Get subscription content successfully 的本地化字符串。
         /// </summary>
         internal static string MsgGetSubscriptionSuccessfully {
             get {
@@ -547,7 +547,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Informations (Filter : {0}) 的本地化字符串。
+        ///   查找类似 Information (Filter : {0}) 的本地化字符串。
         /// </summary>
         internal static string MsgInformationTitle {
             get {
@@ -600,6 +600,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Servers (Filter : {0}) 的本地化字符串。
+        /// </summary>
+        internal static string MsgServerTitle {
+            get {
+                return ResourceManager.GetString("MsgServerTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Simplify PAC Success 的本地化字符串。
         /// </summary>
@@ -700,7 +709,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Non-vmess or ss protocol 的本地化字符串。
+        ///   查找类似 Non-VMess or ss protocol 的本地化字符串。
         /// </summary>
         internal static string NonvmessOrssProtocol {
             get {
@@ -709,7 +718,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  non-Vmess service, this feature is invalid 的本地化字符串。
+        ///   查找类似  non-standard service, this feature is invalid 的本地化字符串。
         /// </summary>
         internal static string NonVmessService {
             get {
@@ -736,7 +745,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  operation failed, please check retry 的本地化字符串。
+        ///   查找类似  operation failed, please check and retry 的本地化字符串。
         /// </summary>
         internal static string OperationFailed {
             get {
@@ -772,7 +781,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select an agreement 的本地化字符串。
+        ///   查找类似 Please select a protocol 的本地化字符串。
         /// </summary>
         internal static string PleaseSelectProtocol {
             get {
@@ -799,7 +808,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 QuickFresh 的本地化字符串。
+        ///   查找类似 Fast 的本地化字符串。
         /// </summary>
         internal static string QuickFresh {
             get {
@@ -880,7 +889,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 SlowFresh 的本地化字符串。
+        ///   查找类似 Slow 的本地化字符串。
         /// </summary>
         internal static string SlowFresh {
             get {
@@ -889,7 +898,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node! 的本地化字符串。
+        ///   查找类似 Note: This feature relies on the Http global proxy. Please manually adjust the Http global proxy and active node after testing. 的本地化字符串。
         /// </summary>
         internal static string SpeedServerTips {
             get {
@@ -907,7 +916,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 PAC failed to start. Run it with Admin right. 的本地化字符串。
+        ///   查找类似 PAC failed to start. Please run this program as Administrator. 的本地化字符串。
         /// </summary>
         internal static string StartPacFailed {
             get {
@@ -925,7 +934,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Successful configuration
+        ///   查找类似 Configuration successful
         ///{0} 的本地化字符串。
         /// </summary>
         internal static string SuccessfulConfiguration {
@@ -935,7 +944,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Successfully imported custom configuration server 的本地化字符串。
+        ///   查找类似 Custom configuration server imported successfully. 的本地化字符串。
         /// </summary>
         internal static string SuccessfullyImportedCustomServer {
             get {

v2rayN/v2rayN/Resx/ResUI.resx

@@ -127,7 +127,7 @@
     <value>Please check the server settings first</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
-    <value> configuration format is incorrect</value>
+    <value>Invalid configuration format</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
     <value>Note that custom configuration relies entirely on your own configuration and does not work with all settings. If you want to use the system proxy, please modify the listening port manually.</value>
@@ -136,7 +136,7 @@
     <value>Downloading...</value>
   </data>
   <data name="downloadSpeed" xml:space="preserve">
-    <value>DOWN</value>
+    <value>Download</value>
   </data>
   <data name="DownloadYesNo" xml:space="preserve">
     <value>Whether to download? {0}</value>
@@ -214,10 +214,10 @@
     <value>Test Results</value>
   </data>
   <data name="LvTodayDownloadDataAmount" xml:space="preserve">
-    <value>Today download traffic</value>
+    <value>Download traffic today</value>
   </data>
   <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>Today upload traffic</value>
+    <value>Upload traffic today</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
     <value>Total download traffic</value>
@@ -229,7 +229,7 @@
     <value>Transport</value>
   </data>
   <data name="MediumFresh" xml:space="preserve">
-    <value>MediumFresh</value>
+    <value>Medium</value>
   </data>
   <data name="MsgClearSubscription" xml:space="preserve">
     <value>Clear original subscription content</value>
@@ -241,7 +241,7 @@
     <value>Failed to import subscription content</value>
   </data>
   <data name="MsgGetSubscriptionSuccessfully" xml:space="preserve">
-    <value>Get the subscription content successfully</value>
+    <value>Get subscription content successfully</value>
   </data>
   <data name="MsgNoValidSubscription" xml:space="preserve">
     <value>No valid subscriptions set</value>
@@ -289,10 +289,10 @@
     <value> This feature relies on the Http global proxy, please set it correctly first.</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>Non-vmess or ss protocol</value>
+    <value>Non-VMess or ss protocol</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
-    <value> non-Vmess service, this feature is invalid</value>
+    <value> non-standard service, this feature is invalid</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>Core not found, please download: {0}</value>
@@ -301,7 +301,7 @@
     <value>Scan completed, no valid QR code found</value>
   </data>
   <data name="OperationFailed" xml:space="preserve">
-    <value> operation failed, please check retry</value>
+    <value> operation failed, please check and retry</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
     <value>Please Fill Remarks</value>
@@ -310,13 +310,13 @@
     <value>Please select the encryption method</value>
   </data>
   <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>Please select an agreement</value>
+    <value>Please select a protocol</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
     <value>Please select the server first</value>
   </data>
   <data name="QuickFresh" xml:space="preserve">
-    <value>QuickFresh</value>
+    <value>Fast</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
     <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
@@ -331,23 +331,23 @@
     <value>The server configuration file is saved at: {0}</value>
   </data>
   <data name="SlowFresh" xml:space="preserve">
-    <value>SlowFresh</value>
+    <value>Slow</value>
   </data>
   <data name="SpeedServerTips" xml:space="preserve">
-    <value>Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!</value>
+    <value>Note: This feature relies on the Http global proxy. Please manually adjust the Http global proxy and active node after testing.</value>
   </data>
   <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC failed to start. Run it with Admin right.</value>
+    <value>PAC failed to start. Please run this program as Administrator.</value>
   </data>
   <data name="StartService" xml:space="preserve">
     <value>Start service ({0})...</value>
   </data>
   <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Successful configuration
+    <value>Configuration successful
 {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Successfully imported custom configuration server</value>
+    <value>Custom configuration server imported successfully.</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
     <value>{0} servers have been imported from clipboard.</value>
@@ -389,7 +389,7 @@
     <value>Download GeoFile: {0} successfully</value>
   </data>
   <data name="MsgInformationTitle" xml:space="preserve">
-    <value>Informations (Filter : {0})</value>
+    <value>Information (Filter : {0})</value>
   </data>
   <data name="LvCustomIcon" xml:space="preserve">
     <value>Custom Icon</value>
@@ -469,4 +469,7 @@
   <data name="LabLocal" xml:space="preserve">
     <value>Local</value>
   </data>
+  <data name="MsgServerTitle" xml:space="preserve">
+    <value>Servers (Filter : {0})</value>
+  </data>
 </root>

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

@@ -289,10 +289,10 @@
     <value>此功能依赖Http全局代理,请先设置正确。</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>非vmess或ss协议</value>
+    <value>非VMess或ss协议</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
-    <value>非Vmess服务，此功能无效</value>
+    <value>非标准服务，此功能无效</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>找不到Core，下载地址: {0}</value>
@@ -469,4 +469,7 @@
   <data name="LabLocal" xml:space="preserve">
     <value>本地</value>
   </data>
+  <data name="MsgServerTitle" xml:space="preserve">
+    <value>服务器 (过滤器 : {0})</value>
+  </data>
 </root>

v2rayN/v2rayN/Tool/Logging.cs

@@ -13,23 +13,27 @@ namespace v2rayN.Tool
     {
         public static void Setup()
         {
-            Hierarchy hierarchy = (Hierarchy)LogManager.GetRepository();
+            var hierarchy = (Hierarchy)LogManager.GetRepository();
 
-            PatternLayout patternLayout = new PatternLayout();
-            patternLayout.ConversionPattern = "%date [%thread] %-5level %logger - %message%newline";
+            var patternLayout = new PatternLayout
+            {
+                ConversionPattern = "%date [%thread] %-5level %logger - %message%newline"
+            };
             patternLayout.ActivateOptions();
 
-            RollingFileAppender roller = new RollingFileAppender();
-            roller.AppendToFile = true;
-            roller.RollingStyle = RollingFileAppender.RollingMode.Date;
-            roller.DatePattern = "yyyy-MM-dd'.txt'";
-            roller.File = Utils.GetPath(@"guiLogs\");
-            roller.Layout = patternLayout;
-            roller.StaticLogFileName = false;
+            var roller = new RollingFileAppender
+            {
+                AppendToFile = true,
+                RollingStyle = RollingFileAppender.RollingMode.Date,
+                DatePattern = "yyyy-MM-dd'.txt'",
+                File = Utils.GetPath(@"guiLogs\"),
+                Layout = patternLayout,
+                StaticLogFileName = false
+            };
             roller.ActivateOptions();
             hierarchy.Root.AddAppender(roller);
 
-            MemoryAppender memory = new MemoryAppender();
+            var memory = new MemoryAppender();
             memory.ActivateOptions();
             hierarchy.Root.AddAppender(memory);
 

v2rayN/v2rayN/Tool/Utils.cs

@@ -23,6 +23,8 @@ using Newtonsoft.Json.Linq;
 using System.Web;
 using log4net;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Runtime.InteropServices;
 
 namespace v2rayN
 {
@@ -397,6 +399,20 @@ namespace v2rayN
         {
             return HttpUtility.UrlDecode(url);
         }
+
+        public static string GetMD5(string str)
+        {
+            var md5 = MD5.Create();
+            byte[] byteOld = Encoding.UTF8.GetBytes(str);
+            byte[] byteNew = md5.ComputeHash(byteOld);
+            StringBuilder sb = new StringBuilder();
+            foreach (byte b in byteNew)
+            {
+                sb.Append(b.ToString("x2"));
+            }
+            return sb.ToString();
+        }
+
         #endregion
 
 
@@ -529,7 +545,13 @@ namespace v2rayN
 
         #region 开机自动启动
 
-        private static string autoRunName = "v2rayNAutoRun";
+        private static string autoRunName
+        {
+            get
+            {
+                return $"v2rayNAutoRun_{GetMD5(StartupPath())}";
+            }
+        }
         private static string autoRunRegPath
         {
             get
@@ -930,7 +952,7 @@ namespace v2rayN
 
         public static string GetDownloadFileName(string url)
         {
-            var fileName = System.IO.Path.GetFileName(url);
+            var fileName = Path.GetFileName(url);
             fileName += "_temp";
 
             return fileName;
@@ -961,7 +983,7 @@ namespace v2rayN
         // return path to store temporary files
         public static string GetTempPath(string filename = "")
         {
-            string _tempPath = Path.Combine(StartupPath(), "v2ray_win_temp");
+            string _tempPath = Path.Combine(StartupPath(), "guiTemps");
             if (!Directory.Exists(_tempPath))
             {
                 Directory.CreateDirectory(_tempPath);
@@ -1090,5 +1112,30 @@ namespace v2rayN
 
         #endregion
 
+
+        #region Windows API
+
+        public static string WindowHwndKey
+        {
+            get
+            {
+                return $"WindowHwnd_{GetMD5(StartupPath())}";
+            }
+        }
+
+        [DllImport("user32.dll")]
+        public static extern bool SetProcessDPIAware();
+
+        [DllImport("user32.dll")]
+        public static extern int ShowWindow(IntPtr hwnd, int nCmdShow);
+
+        [DllImport("user32.dll")]
+        public static extern int SwitchToThisWindow(IntPtr hwnd, bool fUnknown);
+
+        [DllImport("user32.dll")]
+        public static extern bool IsWindow(IntPtr hwnd);
+
+
+        #endregion
     }
 }

v2rayN/v2rayN/v2rayN.csproj

@@ -216,6 +216,7 @@
     <Compile Include="Mode\SysproxyConfig.cs" />
     <Compile Include="Mode\EConfigType.cs" />
     <Compile Include="Mode\ServerTestItem.cs" />
+    <Compile Include="Mode\SsSIP008.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -306,6 +307,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\OptionSettingForm.zh-Hans.resx">
       <DependentUpon>OptionSettingForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\QRCodeControl.zh-Hans.resx">
       <DependentUpon>QRCodeControl.cs</DependentUpon>
@@ -474,6 +476,9 @@
     <None Include="Resources\minimize.png" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Resources\NotifyIcon1.ico" />
+    <Content Include="Resources\NotifyIcon2.ico" />
+    <Content Include="Resources\NotifyIcon3.ico" />
     <EmbeddedResource Include="Sample\SampleInbound.txt" />
     <None Include="Resources\share.png" />
     <None Include="Resources\promotion.png" />
@@ -485,13 +490,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.20.0</Version>
+      <Version>3.21.1</Version>
     </PackageReference>
     <PackageReference Include="Grpc.Core">
-      <Version>2.45.0</Version>
+      <Version>2.46.3</Version>
     </PackageReference>
     <PackageReference Include="Grpc.Tools">
-      <Version>2.45.0</Version>
+      <Version>2.46.3</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>