fix ui

try 放在循环内，有异常不会退出循环。捕获漏网之鱼（syste.memory.dll）

v2rayN/v2rayN/Base/HttpWebServerB.cs

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

v2rayN/v2rayN/Base/WebClientEx.cs

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

v2rayN/v2rayN/Forms/BaseForm.cs

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

v2rayN/v2rayN/Forms/ListViewFlickerFree.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace v2rayN.Base
+namespace v2rayN.Forms
 {
     class ListViewFlickerFree : ListView
     {

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -31,7 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
+            this.lvServers = new v2rayN.Forms.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -52,16 +52,14 @@
             this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.menuPingServer = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuRealPingServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSpeedServer = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.menuExport2ClientConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
-            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
             this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
+            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
             this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
             this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem();
@@ -76,6 +74,7 @@
             this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
+            this.bgwPing = new System.ComponentModel.BackgroundWorker();
             this.bgwScan = new System.ComponentModel.BackgroundWorker();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
@@ -185,8 +184,6 @@
             this.menuSelectAll,
             this.toolStripSeparator9,
             this.menuPingServer,
-            this.menuTcpingServer,
-            this.menuRealPingServer,
             this.menuSpeedServer,
             this.toolStripSeparator6,
             this.menuExport2ClientConfig,
@@ -308,18 +305,6 @@
             resources.ApplyResources(this.menuPingServer, "menuPingServer");
             this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
             // 
-            // menuTcpingServer
-            // 
-            this.menuTcpingServer.Name = "menuTcpingServer";
-            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
-            this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
-            // 
-            // menuRealPingServer
-            // 
-            this.menuRealPingServer.Name = "menuRealPingServer";
-            resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
-            this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
-            // 
             // menuSpeedServer
             // 
             this.menuSpeedServer.Name = "menuSpeedServer";
@@ -355,11 +340,6 @@
             resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
             this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
             // 
-            // qrCodeControl
-            // 
-            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
-            this.qrCodeControl.Name = "qrCodeControl";
-            // 
             // tsbServer
             // 
             this.tsbServer.DropDown = this.cmsLv;
@@ -367,6 +347,11 @@
             resources.ApplyResources(this.tsbServer, "tsbServer");
             this.tsbServer.Name = "tsbServer";
             // 
+            // qrCodeControl
+            // 
+            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
+            this.qrCodeControl.Name = "qrCodeControl";
+            // 
             // notifyMain
             // 
             this.notifyMain.ContextMenuStrip = this.cmsMain;
@@ -465,6 +450,12 @@
             resources.ApplyResources(this.menuExit, "menuExit");
             this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
             // 
+            // bgwPing
+            // 
+            this.bgwPing.WorkerReportsProgress = true;
+            this.bgwPing.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bgwPing_DoWork);
+            this.bgwPing.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgwPing_ProgressChanged);
+            // 
             // bgwScan
             // 
             this.bgwScan.WorkerReportsProgress = true;
@@ -784,13 +775,14 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TextBox txtMsgBox;
-        private v2rayN.Base.ListViewFlickerFree lvServers;
+        private v2rayN.Forms.ListViewFlickerFree lvServers;
         private System.Windows.Forms.NotifyIcon notifyMain;
         private System.Windows.Forms.ContextMenuStrip cmsMain;
         private System.Windows.Forms.ToolStripMenuItem menuExit;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.ToolStripMenuItem menuServers;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.ComponentModel.BackgroundWorker bgwPing;
         private System.Windows.Forms.ContextMenuStrip cmsLv;
         private System.Windows.Forms.ToolStripMenuItem menuAddVmessServer;
         private System.Windows.Forms.ToolStripMenuItem menuRemoveServer;
@@ -866,8 +858,6 @@
         private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank4;
         private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
-        private System.Windows.Forms.ToolStripMenuItem menuTcpingServer;
-        private System.Windows.Forms.ToolStripMenuItem menuRealPingServer;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -8,7 +7,6 @@ using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.HttpProxyHandler;
 using v2rayN.Mode;
-using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -16,7 +14,8 @@ namespace v2rayN.Forms
     {
         private V2rayHandler v2rayHandler;
         private PACListHandle pacListHandle;
-        private DownloadHandle downloadHandle;
+        private V2rayUpdateHandle v2rayUpdateHandle;
+        private V2rayUpdateHandle v2rayUpdateHandle2;
         private List<int> lvSelecteds = new List<int>();
         private StatisticsHandler statistics = null;
 
@@ -33,14 +32,6 @@ namespace v2rayN.Forms
             Application.ApplicationExit += (sender, args) =>
             {
                 Utils.ClearTempPath();
-
-                v2rayHandler.V2rayStop();
-                HttpProxyHandle.Update(config, true);
-                HttpProxyHandle.CloseHttpAgent(config);
-                PACServerHandle.Stop();
-
-                ConfigHandler.SaveConfig(ref config);
-                statistics?.SaveToFile();
                 statistics?.Close();
             };
         }
@@ -50,13 +41,64 @@ namespace v2rayN.Forms
             ConfigHandler.LoadConfig(ref config);
             v2rayHandler = new V2rayHandler();
             v2rayHandler.ProcessEvent += v2rayHandler_ProcessEvent;
-
             if (config.enableStatistics)
             {
                 statistics = new StatisticsHandler(config, UpdateStatisticsHandler);
             }
         }
 
+        private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, ulong down, List<Mode.ServerStatistics> statistics)
+        {
+            try
+            {
+                up /= (ulong)(config.statisticsFreshRate / 1000f);
+                down /= (ulong)(config.statisticsFreshRate / 1000f);
+                toolSslServerSpeed.Text = string.Format(
+                    "{0}/s↑ | {1}/s↓",
+                      Utils.HumanFy(up),
+                      Utils.HumanFy(down)
+                );
+
+            List<string[]> datas = new List<string[]>();
+	            for (int i = 0; i < config.vmess.Count; i++)
+	            {
+	                string totalUp_ = string.Empty,
+	                        totalDown_ = string.Empty,
+	                        todayUp_ = string.Empty,
+	                        todayDown_ = string.Empty;
+	                var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0)));
+	                if (index != -1)
+	                {
+	                        totalUp_ = Utils.HumanFy(statistics[index].totalUp);
+	                        totalDown_ = Utils.HumanFy(statistics[index].totalDown);
+	                        todayUp_ = Utils.HumanFy(statistics[index].todayUp);
+	                        todayDown_ = Utils.HumanFy(statistics[index].todayDown);
+                    }
+
+                    datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ });
+                }
+                
+                lvServers.Invoke((MethodInvoker)delegate
+                {
+                    lvServers.SuspendLayout();
+                    for (int i = 0; i < datas.Count; i++)
+                    {
+                        var indexStart = 9;
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][0];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][1];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][2];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][3];
+                    }
+                    lvServers.ResumeLayout();
+                });
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
         private void MainForm_VisibleChanged(object sender, EventArgs e)
         {
             if (statistics == null || !statistics.Enable) return;
@@ -87,9 +129,18 @@ namespace v2rayN.Forms
             if (e.CloseReason == CloseReason.UserClosing)
             {
                 e.Cancel = true;
+
+                statistics?.SaveToFile();
+
                 HideForm();
                 return;
             }
+            if (e.CloseReason == CloseReason.ApplicationExitCall)
+            {
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
+                statistics?.Close();
+            }
         }
 
         private void MainForm_Resize(object sender, EventArgs e)
@@ -109,24 +160,24 @@ namespace v2rayN.Forms
             //config.uiItem.mainQRCodeWidth = splitContainer1.SplitterDistance;
         }
 
-        //private const int WM_QUERYENDSESSION = 0x0011;
-        //protected override void WndProc(ref Message m)
-        //{
-        //    switch (m.Msg)
-        //    {
-        //        case WM_QUERYENDSESSION:
-        //            Utils.SaveLog("Windows shutdown UnsetProxy");
-
-        //            ConfigHandler.ToJsonFile(config);
-        //            statistics?.SaveToFile();
-        //            ProxySetting.UnsetProxy();
-        //            m.Result = (IntPtr)1;
-        //            break;
-        //        default:
-        //            base.WndProc(ref m);
-        //            break;
-        //    }
-        //}
+        private const int WM_QUERYENDSESSION = 0x0011;
+        protected override void WndProc(ref Message m)
+        {
+            switch (m.Msg)
+            {
+                case WM_QUERYENDSESSION:
+                    Utils.SaveLog("Windows shutdown UnsetProxy");
+                    //CloseV2ray();
+                    ConfigHandler.ToJsonFile(config);
+                    statistics?.SaveToFile();
+                    ProxySetting.UnsetProxy();
+                    m.Result = (IntPtr)1;
+                    break;
+                default:
+                    base.WndProc(ref m);
+                    break;
+            }
+        }
         #endregion
 
         #region 显示服务器 listview 和 menu
@@ -319,29 +370,21 @@ namespace v2rayN.Forms
 
         private void DisplayToolStatus()
         {
+            var localIP = "127.0.0.1";
             toolSslSocksPort.Text =
             toolSslHttpPort.Text =
             toolSslPacPort.Text = "NONE";
 
-            toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}";
+            toolSslSocksPort.Text = $"{localIP}:{config.inbound[0].localPort}";
 
             if (config.sysAgentEnabled)
             {
-                toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
+                toolSslHttpPort.Text = $"{localIP}:{Global.sysAgentPort}";
                 if (config.listenerType == 2 || config.listenerType == 4)
                 {
-                    if (PACServerHandle.IsRunning)
-                    {
-                        toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}";
-                    }
-                    else
-                    {
-                        toolSslPacPort.Text = UIRes.I18N("StartPacFailed");
-                    }
+                    toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}";
                 }
             }
-            notifyMain.Icon = GetNotifyIcon();
-
         }
         private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
         {
@@ -350,46 +393,6 @@ namespace v2rayN.Forms
                 Utils.SetClipboardData(e.ClickedItem.Text);
             }
         }
-
-        private Icon GetNotifyIcon()
-        {
-            try
-            {
-                var color = ColorTranslator.FromHtml("#3399CC");
-                var index = config.sysAgentEnabled ? config.listenerType : 0;
-                if (index > 0)
-                {
-                    color = (new Color[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange })[index - 1];
-                    //color = ColorTranslator.FromHtml(new string[] { "#CC0066", "#CC6600", "#99CC99", "#666699" }[index - 1]);
-                }
-
-                var width = 128;
-                var height = 128;
-
-                var bitmap = new Bitmap(width, height);
-                var graphics = Graphics.FromImage(bitmap);
-                var drawBrush = new SolidBrush(color);
-
-                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
-                var zoom = 16;
-                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
-
-                bitmap.Save(Utils.GetPath("temp_icon.ico"), System.Drawing.Imaging.ImageFormat.Icon);
-
-                Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
-
-                drawBrush.Dispose();
-                graphics.Dispose();
-                bitmap.Dispose();
-
-                return createdIcon;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return this.Icon;
-            }
-        }
         #endregion
 
         #region v2ray 操作
@@ -405,7 +408,6 @@ namespace v2rayN.Forms
             }
             v2rayHandler.LoadV2ray(config);
             Global.reloadV2ray = false;
-            ConfigHandler.SaveConfig(ref config, false);
 
             ChangeSysAgent(config.sysAgentEnabled);
             DisplayToolStatus();
@@ -416,7 +418,7 @@ namespace v2rayN.Forms
         /// </summary>
         private void CloseV2ray()
         {
-            ConfigHandler.SaveConfig(ref config, false);
+            ConfigHandler.ToJsonFile(config);
 
             ChangeSysAgent(false);
 
@@ -488,18 +490,12 @@ namespace v2rayN.Forms
                     case Keys.A:
                         menuSelectAll_Click(null, null);
                         break;
-                    case Keys.P:
-                        menuPingServer_Click(null, null);
-                        break;
-                    case Keys.O:
-                        menuTcpingServer_Click(null, null);
-                        break;
-                    case Keys.R:
-                        menuRealPingServer_Click(null, null);
-                        break;
                     case Keys.T:
                         menuSpeedServer_Click(null, null);
                         break;
+                    case Keys.P:
+                        menuPingServer_Click(null, null);
+                        break;
                 }
             }
             switch (e.KeyCode)
@@ -564,6 +560,9 @@ namespace v2rayN.Forms
             //刷新
             RefreshServers();
             LoadV2ray();
+
+            // save to config file
+            ConfigHandler.ToJsonFile(config);
         }
 
         private void menuCopyServer_Click(object sender, EventArgs e)
@@ -593,43 +592,23 @@ namespace v2rayN.Forms
 
         private void menuPingServer_Click(object sender, EventArgs e)
         {
-            Speedtest("ping");
-        }
-        private void menuTcpingServer_Click(object sender, EventArgs e)
-        {
-            Speedtest("tcping");
-        }
-
-        private void menuRealPingServer_Click(object sender, EventArgs e)
-        {
-            //if (!config.sysAgentEnabled)
-            //{
-            //    UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
-            //    return;
-            //}
-
-            //UI.Show(UIRes.I18N("SpeedServerTips"));
-
-            Speedtest("realping");
+            GetLvSelectedIndex();
+            ClearTestResult();
+            bgwPing.RunWorkerAsync();
         }
 
         private void menuSpeedServer_Click(object sender, EventArgs e)
         {
-            //if (!config.sysAgentEnabled)
-            //{
-            //    UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
-            //    return;
-            //}
+            if (!config.sysAgentEnabled || config.listenerType != 1)
+            {
+                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+                return;
+            }
 
-            //UI.Show(UIRes.I18N("SpeedServerTips"));
+            UI.Show(UIRes.I18N("SpeedServerTips"));
 
-            Speedtest("speedtest");
-        }
-        private void Speedtest(string actionType)
-        {
             GetLvSelectedIndex();
-            ClearTestResult();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, actionType, UpdateSpeedtestHandler);
+            ServerSpeedTest();
         }
 
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -1005,10 +984,15 @@ namespace v2rayN.Forms
 
         private void menuExit_Click(object sender, EventArgs e)
         {
+            CloseV2ray();
 
             this.Visible = false;
             this.Close();
 
+            statistics?.Close();
+
+            //this.Dispose();
+            //System.Environment.Exit(System.Environment.ExitCode);
             Application.Exit();
         }
 
@@ -1028,7 +1012,7 @@ namespace v2rayN.Forms
         {
             //this.WindowState = FormWindowState.Minimized;
             this.Hide();
-            //this.notifyMain.Icon = this.Icon;
+            this.notifyMain.Icon = this.Icon;
             this.notifyMain.Visible = true;
             this.ShowInTaskbar = false;
 
@@ -1039,6 +1023,39 @@ namespace v2rayN.Forms
 
         #region 后台测速
 
+        private void bgwPing_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
+        {
+            try
+            {
+                for (int k = 0; k < lvSelecteds.Count; k++)
+                {
+                    int index = lvSelecteds[k];
+                    if (config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    long time = Utils.Ping(config.vmess[index].address);
+                    bgwPing.ReportProgress(index, string.Format("{0}ms", time));
+                }
+            }
+            catch
+            {
+
+            }
+        }
+
+        private void bgwPing_ProgressChanged(object sender, System.ComponentModel.ProgressChangedEventArgs e)
+        {
+            try
+            {
+                int k = e.ProgressPercentage;
+                string time = string.Format("{0}", Convert.ToString(e.UserState));
+                SetTestResult(k, time);
+            }
+            catch
+            {
+            }
+        }
         private void SetTestResult(int k, string txt)
         {
             config.vmess[k].testResult = txt;
@@ -1051,70 +1068,77 @@ namespace v2rayN.Forms
                 SetTestResult(k, "");
             }
         }
-        private void UpdateSpeedtestHandler(int index, string msg)
+
+        private int testCounter = 0;
+        private int ServerSpeedTestSub(int index, string url)
         {
-            lvServers.Invoke((MethodInvoker)delegate
+            if (index >= lvSelecteds.Count)
             {
-                lvServers.SuspendLayout();
-
-                SetTestResult(index, msg);
-
-                lvServers.ResumeLayout();
-            });
-        }
-
-        private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, ulong down, List<Mode.ServerStatistics> statistics)
-        {
-            try
-            {
-                up /= (ulong)(config.statisticsFreshRate / 1000f);
-                down /= (ulong)(config.statisticsFreshRate / 1000f);
-                toolSslServerSpeed.Text = string.Format(
-                    "{0}/s↑ | {1}/s↓",
-                      Utils.HumanFy(up),
-                      Utils.HumanFy(down)
-                );
-
-                List<string[]> datas = new List<string[]>();
-                for (int i = 0; i < config.vmess.Count; i++)
-                {
-                    string totalUp_ = string.Empty,
-                            totalDown_ = string.Empty,
-                            todayUp_ = string.Empty,
-                            todayDown_ = string.Empty;
-                    var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0)));
-                    if (index != -1)
-                    {
-                        totalUp_ = Utils.HumanFy(statistics[index].totalUp);
-                        totalDown_ = Utils.HumanFy(statistics[index].totalDown);
-                        todayUp_ = Utils.HumanFy(statistics[index].todayUp);
-                        todayDown_ = Utils.HumanFy(statistics[index].todayDown);
-                    }
-
-                    datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ });
-                }
-
-                lvServers.Invoke((MethodInvoker)delegate
-                {
-                    lvServers.SuspendLayout();
-                    for (int i = 0; i < datas.Count; i++)
-                    {
-                        var indexStart = 9;
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][0];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][1];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][2];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][3];
-                    }
-                    lvServers.ResumeLayout();
-                });
-
+                return -1;
             }
-            catch (Exception ex)
+
+            if (ConfigHandler.SetDefaultServer(ref config, lvSelecteds[index]) == 0)
             {
-                Utils.SaveLog(ex.Message, ex);
+                SetTestResult(lvSelecteds[index], "testing...");
+
+                v2rayHandler.LoadV2ray(config);
+                v2rayUpdateHandle2.DownloadFileAsync(config, url);
+                testCounter++;
+                return 0;
+            }
+            else
+            {
+                return -1;
             }
         }
+        private void ServerSpeedTest()
+        {
+            if (config.vmess.Count <= 0)
+            {
+                return;
+            }
+            ClearTestResult();
 
+            string url = Global.SpeedTestUrl;
+            testCounter = 0;
+            if (v2rayUpdateHandle2 == null)
+            {
+                v2rayUpdateHandle2 = new V2rayUpdateHandle();
+                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        AppendText(false, args.Msg);
+                        SetTestResult(lvSelecteds[testCounter - 1], args.Msg);
+
+                        if (ServerSpeedTestSub(testCounter, url) != 0)
+                        {
+                            RefreshServers();
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        AppendText(false, args.Msg);
+                    }
+                };
+                v2rayUpdateHandle2.Error += (sender2, args) =>
+                {
+                    SetTestResult(lvSelecteds[testCounter - 1], args.GetException().Message);
+                    AppendText(true, args.GetException().Message);
+
+                    if (ServerSpeedTestSub(testCounter, url) != 0)
+                    {
+                        RefreshServers();
+                        return;
+                    }
+                };
+            }
+            if (ServerSpeedTestSub(testCounter, url) != 0)
+            {
+                return;
+            }
+        }
         #endregion
 
         #region 移动服务器
@@ -1234,7 +1258,6 @@ namespace v2rayN.Forms
                         break;
                 }
             }
-            ConfigHandler.SaveConfig(ref config, false);
             DisplayToolStatus();
         }
 
@@ -1246,7 +1269,7 @@ namespace v2rayN.Forms
         {
             if (isChecked)
             {
-                if (HttpProxyHandle.RestartHttpAgent(config, false))
+                if (HttpProxyHandle.RestartHttpAgent(config, true))
                 {
                     ChangePACButtonStatus(config.listenerType);
                 }
@@ -1274,10 +1297,10 @@ namespace v2rayN.Forms
 
         private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
         {
-            if (downloadHandle == null)
+            if (v2rayUpdateHandle == null)
             {
-                downloadHandle = new DownloadHandle();
-                downloadHandle.AbsoluteCompleted += (sender2, args) =>
+                v2rayUpdateHandle = new V2rayUpdateHandle();
+                v2rayUpdateHandle.AbsoluteCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1293,7 +1316,7 @@ namespace v2rayN.Forms
                             }
                             else
                             {
-                                downloadHandle.DownloadFileAsync(config, url, null);
+                                v2rayUpdateHandle.DownloadFileAsync(config, url);
                             }
                         }));
                     }
@@ -1302,7 +1325,7 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                v2rayUpdateHandle.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1313,7 +1336,7 @@ namespace v2rayN.Forms
                         {
                             CloseV2ray();
 
-                            string fileName = downloadHandle.DownloadFileName;
+                            string fileName = v2rayUpdateHandle.DownloadFileName;
                             fileName = Utils.GetPath(fileName);
                             using (ZipArchive archive = ZipFile.OpenRead(fileName))
                             {
@@ -1341,14 +1364,14 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                downloadHandle.Error += (sender2, args) =>
+                v2rayUpdateHandle.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
             }
 
             AppendText(false, UIRes.I18N("MsgStartUpdatingV2rayCore"));
-            downloadHandle.AbsoluteV2rayCore(config);
+            v2rayUpdateHandle.AbsoluteV2rayCore(config);
         }
 
         private void tsbCheckUpdatePACList_Click(object sender, EventArgs e)
@@ -1400,7 +1423,7 @@ namespace v2rayN.Forms
 
         private void tsbPromotion_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start($"{Global.PromotionUrl}?t={DateTime.Now.Ticks}");
+            System.Diagnostics.Process.Start(Global.PromotionUrl);
         }
         #endregion
 
@@ -1468,8 +1491,8 @@ namespace v2rayN.Forms
                     continue;
                 }
 
-                DownloadHandle downloadHandle3 = new DownloadHandle();
-                downloadHandle3.UpdateCompleted += (sender2, args) =>
+                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
+                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1498,12 +1521,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                downloadHandle3.Error += (sender2, args) =>
+                v2rayUpdateHandle3.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                downloadHandle3.WebDownloadString(url);
+                v2rayUpdateHandle3.WebDownloadString(url);
                 AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
             }
 
@@ -1530,7 +1553,5 @@ namespace v2rayN.Forms
 
 
         #endregion
-
-
     }
 }

v2rayN/v2rayN/Forms/MainForm.resx

@@ -231,19 +231,7 @@
     <value>447, 22</value>
   </data>
   <data name="menuPingServer.Text" xml:space="preserve">
-    <value>Test server ping (multiple choice)(Ctrl+P)</value>
-  </data>
-  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>447, 22</value>
-  </data>
-  <data name="menuTcpingServer.Text" xml:space="preserve">
-    <value>Test server tcping (multiple choice)(Ctrl+O)</value>
-  </data>
-  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>447, 22</value>
-  </data>
-  <data name="menuRealPingServer.Text" xml:space="preserve">
-    <value>Test server real ping (multiple choice)(Ctrl+R)</value>
+    <value>Test server delay (multiple choice)(Ctrl+P)</value>
   </data>
   <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
     <value>447, 22</value>
@@ -291,7 +279,7 @@
     <value>ImageAboveText</value>
   </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>448, 556</value>
+    <value>448, 490</value>
   </data>
   <data name="&gt;&gt;cmsLv.Name" xml:space="preserve">
     <value>cmsLv</value>
@@ -506,6 +494,9 @@
   <data name="notifyMain.Visible" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <metadata name="bgwPing.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>232, 17</value>
+  </metadata>
   <metadata name="bgwScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>498, 17</value>
   </metadata>
@@ -570,7 +561,7 @@
     <value>0</value>
   </data>
   <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>228, 18</value>
+    <value>603, 17</value>
   </metadata>
   <data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 8pt</value>
@@ -588,7 +579,7 @@
     <value>微软雅黑, 8pt</value>
   </data>
   <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 17</value>
+    <value>188, 17</value>
   </data>
   <data name="toolSslHttpPortLab.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 8pt</value>
@@ -606,7 +597,7 @@
     <value>微软雅黑, 8pt</value>
   </data>
   <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 17</value>
+    <value>188, 17</value>
   </data>
   <data name="toolSslPacPortLab.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 8pt</value>
@@ -624,7 +615,7 @@
     <value>微软雅黑, 8pt</value>
   </data>
   <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 17</value>
+    <value>188, 17</value>
   </data>
   <data name="toolSslServerSpeed.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1058,18 +1049,6 @@
   <data name="&gt;&gt;menuPingServer.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;menuTcpingServer.Name" xml:space="preserve">
-    <value>menuTcpingServer</value>
-  </data>
-  <data name="&gt;&gt;menuTcpingServer.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;menuRealPingServer.Name" xml:space="preserve">
-    <value>menuRealPingServer</value>
-  </data>
-  <data name="&gt;&gt;menuRealPingServer.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;menuSpeedServer.Name" xml:space="preserve">
     <value>menuSpeedServer</value>
   </data>
@@ -1190,6 +1169,12 @@
   <data name="&gt;&gt;menuExit.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;bgwPing.Name" xml:space="preserve">
+    <value>bgwPing</value>
+  </data>
+  <data name="&gt;&gt;bgwPing.Type" xml:space="preserve">
+    <value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;bgwScan.Name" xml:space="preserve">
     <value>bgwScan</value>
   </data>

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

@@ -119,157 +119,151 @@
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddVmessServer.Text" xml:space="preserve">
     <value>添加[VMess]服务器</value>
   </data>
   <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddShadowsocksServer.Text" xml:space="preserve">
     <value>添加[Shadowsocks]服务器</value>
   </data>
   <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddSocksServer.Text" xml:space="preserve">
     <value>添加[Socks]服务器</value>
   </data>
   <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddCustomServer.Text" xml:space="preserve">
     <value>添加自定义配置服务器</value>
   </data>
   <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddServers.Text" xml:space="preserve">
     <value>从剪贴板导入批量URL</value>
   </data>
   <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuScanScreen.Text" xml:space="preserve">
     <value>扫描屏幕上的二维码</value>
   </data>
   <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuRemoveServer.Text" xml:space="preserve">
     <value>移除所选服务器(多选)   (Delete)</value>
   </data>
   <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuRemoveDuplicateServer.Text" xml:space="preserve">
     <value>移除重复的服务器</value>
   </data>
   <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuCopyServer.Text" xml:space="preserve">
     <value>复制所选服务器</value>
   </data>
   <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuSetDefaultServer.Text" xml:space="preserve">
     <value>设为活动服务器   (Enter)</value>
   </data>
   <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveTop.Text" xml:space="preserve">
     <value>上移至顶</value>
   </data>
   <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveUp.Text" xml:space="preserve">
     <value>上移      (U)</value>
   </data>
   <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveDown.Text" xml:space="preserve">
     <value>下移      (D)</value>
   </data>
   <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveBottom.Text" xml:space="preserve">
     <value>下移至底</value>
   </data>
   <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuSelectAll.Text" xml:space="preserve">
     <value>全选      (Ctrl+A)</value>
   </data>
   <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuPingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟Ping(多选)(Ctrl+P)</value>
-  </data>
-  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
-  </data>
-  <data name="menuTcpingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟Tcping(多选)(Ctrl+O)</value>
-  </data>
-  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
-  </data>
-  <data name="menuRealPingServer.Text" xml:space="preserve">
-    <value>测试服务器真连接延迟(多选)(Ctrl+R)</value>
+    <value>测试服务器延迟(多选)(Ctrl+P)</value>
   </data>
   <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuSpeedServer.Text" xml:space="preserve">
     <value>测试服务器速度(多选)(Ctrl+T)</value>
   </data>
   <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2ClientConfig.Text" xml:space="preserve">
     <value>导出所选服务器为客户端配置</value>
   </data>
   <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2ServerConfig.Text" xml:space="preserve">
     <value>导出所选服务器为服务端配置</value>
   </data>
   <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2ShareUrl.Text" xml:space="preserve">
     <value>批量导出分享URL至剪贴板(多选)</value>
   </data>
   <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2SubContent.Text" xml:space="preserve">
     <value>批量导出订阅内容至剪贴板(多选)</value>
   </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>  服务器  </value>
+  </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>279, 534</value>
+    <value>253, 490</value>
   </data>
   <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -288,12 +282,6 @@
         ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
   </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>  服务器  </value>
-  </data>
   <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
     <value>196, 164</value>
   </data>
@@ -372,8 +360,14 @@
   <data name="groupBox2.Text" xml:space="preserve">
     <value>信息</value>
   </data>
-  <data name="toolSslServerSpeed.Text" xml:space="preserve">
-    <value>网速显示未启用</value>
+  <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>176, 17</value>
+  </data>
+  <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>176, 17</value>
+  </data>
+  <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>176, 17</value>
   </data>
   <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 53</value>
@@ -401,13 +395,13 @@
   </data>
   <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
-        QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X
-        jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY
-        6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3
-        NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY
-        B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM
+        mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY
+        FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr
+        flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh
+        VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh
+        6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
@@ -463,12 +457,15 @@
   </data>
   <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
-        GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
+        8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbClose.Text" xml:space="preserve">
     <value>  关闭  </value>
   </data>
+  <data name="toolSslServerSpeed.Text" xml:space="preserve">
+    <value>网速显示未启用</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionSettingForm));
             this.btnClose = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -62,9 +63,8 @@
             this.txtUserblock = new System.Windows.Forms.TextBox();
             this.panel3 = new System.Windows.Forms.Panel();
             this.btnSetDefRountingRule = new System.Windows.Forms.Button();
-            this.labRoutingTips = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
+            this.labRoutingTips = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.cmbroutingMode = new System.Windows.Forms.ComboBox();
@@ -95,6 +95,7 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.configBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -108,36 +109,36 @@
             this.tabPage6.SuspendLayout();
             this.tabPage7.SuspendLayout();
             this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // btnClose
             // 
-            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            resources.ApplyResources(this.btnClose, "btnClose");
             this.btnClose.Name = "btnClose";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // tabControl1
             // 
-            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage6);
             this.tabControl1.Controls.Add(this.tabPage7);
+            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             // 
             // tabPage1
             // 
-            resources.ApplyResources(this.tabPage1, "tabPage1");
             this.tabPage1.Controls.Add(this.groupBox1);
+            resources.ApplyResources(this.tabPage1, "tabPage1");
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.chksniffingEnabled2);
             this.groupBox1.Controls.Add(this.chksniffingEnabled);
             this.groupBox1.Controls.Add(this.txtremoteDNS);
@@ -156,6 +157,7 @@
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.txtlocalPort);
             this.groupBox1.Controls.Add(this.label2);
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
@@ -202,12 +204,12 @@
             // 
             // cmbprotocol2
             // 
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol2.FormattingEnabled = true;
             this.cmbprotocol2.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol2.Items"),
             resources.GetString("cmbprotocol2.Items1")});
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.Name = "cmbprotocol2";
             // 
             // label3
@@ -222,8 +224,8 @@
             // 
             // cmbprotocol
             // 
-            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
             this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
             this.cmbprotocol.FormattingEnabled = true;
             this.cmbprotocol.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol.Items"),
@@ -249,7 +251,6 @@
             // 
             // cmbloglevel
             // 
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbloglevel.FormattingEnabled = true;
             this.cmbloglevel.Items.AddRange(new object[] {
@@ -258,6 +259,7 @@
             resources.GetString("cmbloglevel.Items2"),
             resources.GetString("cmbloglevel.Items3"),
             resources.GetString("cmbloglevel.Items4")});
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.Name = "cmbloglevel";
             // 
             // label5
@@ -277,32 +279,32 @@
             // 
             // tabPage2
             // 
-            resources.ApplyResources(this.tabPage2, "tabPage2");
             this.tabPage2.Controls.Add(this.groupBox2);
+            resources.ApplyResources(this.tabPage2, "tabPage2");
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // groupBox2
             // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.tabControl2);
             this.groupBox2.Controls.Add(this.panel3);
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
             // tabControl2
             // 
-            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Controls.Add(this.tabPage3);
             this.tabControl2.Controls.Add(this.tabPage4);
             this.tabControl2.Controls.Add(this.tabPage5);
+            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Name = "tabControl2";
             this.tabControl2.SelectedIndex = 0;
             // 
             // tabPage3
             // 
-            resources.ApplyResources(this.tabPage3, "tabPage3");
             this.tabPage3.Controls.Add(this.txtUseragent);
+            resources.ApplyResources(this.tabPage3, "tabPage3");
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
@@ -313,8 +315,8 @@
             // 
             // tabPage4
             // 
-            resources.ApplyResources(this.tabPage4, "tabPage4");
             this.tabPage4.Controls.Add(this.txtUserdirect);
+            resources.ApplyResources(this.tabPage4, "tabPage4");
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.UseVisualStyleBackColor = true;
             // 
@@ -325,8 +327,8 @@
             // 
             // tabPage5
             // 
-            resources.ApplyResources(this.tabPage5, "tabPage5");
             this.tabPage5.Controls.Add(this.txtUserblock);
+            resources.ApplyResources(this.tabPage5, "tabPage5");
             this.tabPage5.Name = "tabPage5";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
@@ -337,14 +339,13 @@
             // 
             // panel3
             // 
-            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Controls.Add(this.btnSetDefRountingRule);
-            this.panel3.Controls.Add(this.labRoutingTips);
-            this.panel3.Controls.Add(this.label4);
             this.panel3.Controls.Add(this.cmbdomainStrategy);
+            this.panel3.Controls.Add(this.labRoutingTips);
             this.panel3.Controls.Add(this.label15);
             this.panel3.Controls.Add(this.label12);
             this.panel3.Controls.Add(this.cmbroutingMode);
+            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Name = "panel3";
             // 
             // btnSetDefRountingRule
@@ -354,29 +355,23 @@
             this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
             this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
             // 
-            // labRoutingTips
-            // 
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            this.labRoutingTips.Name = "labRoutingTips";
-            // 
-            // label4
-            // 
-            resources.ApplyResources(this.label4, "label4");
-            this.label4.ForeColor = System.Drawing.Color.Brown;
-            this.label4.Name = "label4";
-            // 
             // cmbdomainStrategy
             // 
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbdomainStrategy.FormattingEnabled = true;
             this.cmbdomainStrategy.Items.AddRange(new object[] {
             resources.GetString("cmbdomainStrategy.Items"),
             resources.GetString("cmbdomainStrategy.Items1"),
             resources.GetString("cmbdomainStrategy.Items2")});
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.Name = "cmbdomainStrategy";
             // 
+            // labRoutingTips
+            // 
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
             // label15
             // 
             resources.ApplyResources(this.label15, "label15");
@@ -389,7 +384,6 @@
             // 
             // cmbroutingMode
             // 
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbroutingMode.FormattingEnabled = true;
             this.cmbroutingMode.Items.AddRange(new object[] {
@@ -397,11 +391,11 @@
             resources.GetString("cmbroutingMode.Items1"),
             resources.GetString("cmbroutingMode.Items2"),
             resources.GetString("cmbroutingMode.Items3")});
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.Name = "cmbroutingMode";
             // 
             // tabPage6
             // 
-            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Controls.Add(this.chkKcpcongestion);
             this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
             this.tabPage6.Controls.Add(this.label10);
@@ -415,6 +409,7 @@
             this.tabPage6.Controls.Add(this.label7);
             this.tabPage6.Controls.Add(this.txtKcpmtu);
             this.tabPage6.Controls.Add(this.label6);
+            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Name = "tabPage6";
             this.tabPage6.UseVisualStyleBackColor = true;
             // 
@@ -486,7 +481,6 @@
             // 
             // tabPage7
             // 
-            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Controls.Add(this.cbFreshrate);
             this.tabPage7.Controls.Add(this.tbCacheDays);
             this.tabPage7.Controls.Add(this.lbFreshrate);
@@ -496,14 +490,15 @@
             this.tabPage7.Controls.Add(this.txturlGFWList);
             this.tabPage7.Controls.Add(this.label13);
             this.tabPage7.Controls.Add(this.chkAutoRun);
+            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
             // cbFreshrate
             // 
-            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbFreshrate.FormattingEnabled = true;
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.Name = "cbFreshrate";
             // 
             // tbCacheDays
@@ -551,9 +546,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
@@ -568,6 +563,10 @@
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
+            // configBindingSource
+            // 
+            this.configBindingSource.DataSource = typeof(v2rayN.Mode.Config);
+            // 
             // OptionSettingForm
             // 
             resources.ApplyResources(this, "$this");
@@ -599,6 +598,7 @@
             this.tabPage7.ResumeLayout(false);
             this.tabPage7.PerformLayout();
             this.panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -670,6 +670,6 @@
         private System.Windows.Forms.Label lbCacheDays;
         private System.Windows.Forms.ComboBox cbFreshrate;
         private System.Windows.Forms.Label lbFreshrate;
-        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.BindingSource configBindingSource;
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
-using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -43,10 +42,6 @@ namespace v2rayN.Forms
                 cmbprotocol.Text = config.inbound[0].protocol.ToString();
                 chkudpEnabled.Checked = config.inbound[0].udpEnabled;
                 chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;
-
-                txtlocalPort2.Text = $"{config.inbound[0].localPort + 1}";
-                cmbprotocol2.Text = Global.InboundHttp;
-
                 if (config.inbound.Count > 1)
                 {
                     txtlocalPort2.Text = config.inbound[1].localPort.ToString();
@@ -127,7 +122,7 @@ namespace v2rayN.Forms
             cbFreshrate.DisplayMember = "Text";
             cbFreshrate.ValueMember = "ID";
 
-            switch (config.statisticsFreshRate)
+            switch(config.statisticsFreshRate)
             {
                 case (int)Global.StatisticsFreshRate.quick:
                     cbFreshrate.SelectedItem = cbSource[0];
@@ -369,14 +364,10 @@ namespace v2rayN.Forms
 
         private void btnSetDefRountingRule_Click(object sender, EventArgs e)
         {
-            txtUseragent.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.agentTag);
-            txtUserdirect.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.directTag);
-            txtUserblock.Text = Utils.GetEmbedText(Global.CustomRoutingFileName + Global.blockTag);
-
             var lstUrl = new List<string>();
-            lstUrl.Add(Global.CustomRoutingListUrl + Global.agentTag);
-            lstUrl.Add(Global.CustomRoutingListUrl + Global.directTag);
-            lstUrl.Add(Global.CustomRoutingListUrl + Global.blockTag);
+            lstUrl.Add(Global.CustomRoutingListUrl + "proxy");
+            lstUrl.Add(Global.CustomRoutingListUrl + "direct");
+            lstUrl.Add(Global.CustomRoutingListUrl + "block");
 
             var lstTxt = new List<TextBox>();
             lstTxt.Add(txtUseragent);
@@ -386,8 +377,8 @@ namespace v2rayN.Forms
             for (int k = 0; k < lstUrl.Count; k++)
             {
                 var txt = lstTxt[k];
-                DownloadHandle downloadHandle = new DownloadHandle();
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
+                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -403,12 +394,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                downloadHandle.Error += (sender2, args) =>
+                v2rayUpdateHandle3.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                downloadHandle.WebDownloadString(lstUrl[k]);
+                v2rayUpdateHandle3.WebDownloadString(lstUrl[k]);
             }
         }
         void AppendText(bool notify, string text)
@@ -419,13 +410,7 @@ namespace v2rayN.Forms
 
     class ComboItem
     {
-        public int ID
-        {
-            get; set;
-        }
-        public string Text
-        {
-            get; set;
-        }
+        public int ID { get; set; }
+        public string Text { get; set; }
     }
 }

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

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

v2rayN/v2rayN/Forms/SubSettingControl.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Forms;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Forms

v2rayN/v2rayN/Global.cs

@@ -18,15 +18,12 @@ namespace v2rayN
         /// SpeedTestUrl
         /// </summary>
         public const string SpeedTestUrl = @"http://speedtest-sfo2.digitalocean.com/10mb.test";
-        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
 
         /// <summary>
         /// CustomRoutingListUrl
         /// </summary>
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
 
-        public const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
-
         /// <summary>
         /// PromotionUrl
         /// </summary>
@@ -63,8 +60,6 @@ namespace v2rayN
         /// </summary>
         public const string BlankPacFileName = "v2rayN.Sample.BlankPac.txt";
 
-        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
-
 
         /// <summary>
         /// 默认加密方式
@@ -100,19 +95,12 @@ namespace v2rayN
         /// 阻止 tag值
         /// </summary>
         public const string blockTag = "block";
-
+        
         /// <summary>
         /// 
         /// </summary>
         public const string StreamSecurity = "tls";
 
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
-        public const string InboundAPIProtocal = "dokodemo-door";
-
-
         /// <summary>
         /// vmess
         /// </summary>
@@ -158,6 +146,12 @@ namespace v2rayN
         /// </summary>
         public const string CustomIconName = "v2rayN.ico";
 
+
+        public const string InboundAPITagName = "api";
+        public const string InboundProxyTagName = "proxy";
+        public const string Loopback = "127.0.0.1";
+        public const string InboundAPIProtocal = "dokodemo-door";
+     
         public enum StatisticsFreshRate
         {
             quick = 1000,
@@ -174,50 +168,32 @@ namespace v2rayN
         /// <summary>
         /// 是否需要重启服务V2ray
         /// </summary>
-        public static bool reloadV2ray
-        {
-            get; set;
-        }
+        public static bool reloadV2ray { get; set; }
 
         /// <summary>
         /// 是否开启全局代理(http)
         /// </summary>
-        public static bool sysAgent
-        {
-            get; set;
-        }
+        public static bool sysAgent { get; set; }
 
         /// <summary>
-        /// socks端口
+        /// socks端口号
         /// </summary>
-        public static int socksPort
-        {
-            get; set;
-        }
+        public static int socksPort { get; set; }
 
         /// <summary>
-        /// http端口
+        /// 全局代理端口(http)
         /// </summary>
-        public static int httpPort
-        {
-            get; set;
-        }
+        public static int sysAgentPort { get; set; }
 
         /// <summary>
-        /// PAC端口
+        /// PAC监听端口号
         /// </summary>
-        public static int pacPort
-        {
-            get; set;
-        }
+        public static int pacPort { get; set; }
 
         /// <summary>
         ///  
         /// </summary>
-        public static int statePort
-        {
-            get; set;
-        }
+        public static int statePort { get; set; }
 
         #endregion
 

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using v2rayN.Mode;
-using v2rayN.Base;
 
 namespace v2rayN.Handler
 {
@@ -57,7 +56,7 @@ namespace v2rayN.Handler
             {
                 config.inbound = new List<InItem>();
                 InItem inItem = new InItem();
-                inItem.protocol = Global.InboundSocks;
+                inItem.protocol = "socks";
                 inItem.localPort = 10808;
                 inItem.udpEnabled = true;
                 inItem.sniffingEnabled = true;
@@ -76,7 +75,7 @@ namespace v2rayN.Handler
                 //http协议不由core提供,只保留socks
                 if (config.inbound.Count > 0)
                 {
-                    config.inbound[0].protocol = Global.InboundSocks;
+                    config.inbound[0].protocol = "socks";
                 }
             }
             //路由规则
@@ -121,10 +120,6 @@ namespace v2rayN.Handler
             //{
             //    config.pacPort = 8888;
             //}
-            if (Utils.IsNullOrEmpty(config.urlGFWList))
-            {
-                config.urlGFWList = Global.GFWLIST_URL;
-            }
 
             if (config.subItem == null)
             {
@@ -307,9 +302,9 @@ namespace v2rayN.Handler
         /// </summary>
         /// <param name="config"></param>
         /// <returns></returns>
-        public static int SaveConfig(ref Config config, bool reload = true)
+        public static int SaveConfig(ref Config config)
         {
-            Global.reloadV2ray = reload;
+            Global.reloadV2ray = true;
 
             ToJsonFile(config);
 
@@ -320,7 +315,7 @@ namespace v2rayN.Handler
         /// 存储文件
         /// </summary>
         /// <param name="config"></param>
-        private static void ToJsonFile(Config config)
+        public static void ToJsonFile(Config config)
         {
             Utils.ToJsonFile(config, Utils.GetPath(configRes));
         }
@@ -519,11 +514,11 @@ namespace v2rayN.Handler
         {
             string newFileName = string.Empty;
             newFileName = string.Format("{0}.json", Utils.GetGUID());
-            //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
+            newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
 
             try
             {
-                File.Copy(fileName, Path.Combine(Utils.GetTempPath(), newFileName));
+                File.Copy(fileName, newFileName);
             }
             catch
             {
@@ -583,7 +578,7 @@ namespace v2rayN.Handler
             vmessItem.address = vmessItem.address.TrimEx();
             vmessItem.id = vmessItem.id.TrimEx();
             vmessItem.security = vmessItem.security.TrimEx();
-
+           
             if (index >= 0)
             {
                 //修改

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

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

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -6,9 +6,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using v2rayN.Mode;
-using v2rayN.Properties;
 using v2rayN.Protos.Statistics;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
@@ -25,42 +23,21 @@ namespace v2rayN.Handler
         private bool enabled_;
         public bool Enable
         {
-            get
-            {
-                return enabled_;
-            }
-            set
-            {
-                enabled_ = value;
-            }
+            get { return enabled_; }
+            set { enabled_ = value; }
         }
 
         public bool UpdateUI;
 
-        public ulong TotalUp
-        {
-            get; private set;
-        }
+        public ulong TotalUp { get; private set; }
 
-        public ulong TotalDown
-        {
-            get; private set;
-        }
+        public ulong TotalDown { get; private set; }
 
-        public List<Mode.ServerStatistics> Statistic
-        {
-            get; set;
-        }
+        public List<Mode.ServerStatistics> Statistic { get; set; }
 
-        public ulong Up
-        {
-            get; private set;
-        }
+        public ulong Up { get; private set; }
 
-        public ulong Down
-        {
-            get; private set;
-        }
+        public ulong Down { get; private set; }
 
         private string logPath_;
 
@@ -68,28 +45,11 @@ namespace v2rayN.Handler
 
         public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> update)
         {
-            try
-            {
-                if (Environment.Is64BitOperatingSystem)
-                {
-                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll);
-                }
-                else
-                {
-                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll);
-                }
-            }
-            catch (IOException ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-            }
-
             config_ = config;
             enabled_ = config.enableStatistics;
             UpdateUI = false;
             updateFunc_ = update;
-            logPath_ = Utils.GetPath(Global.StatisticLogDirectory);
+            logPath_ = Utils.GetPath($"{Global.StatisticLogDirectory}\\");
             Statistic = new List<Mode.ServerStatistics>();
             exitFlag_ = false;
 
@@ -105,7 +65,6 @@ namespace v2rayN.Handler
             GrpcInit();
 
             workThread_ = new Thread(new ThreadStart(Run));
-            workThread_.IsBackground = true;
             workThread_.Start();
         }
 
@@ -115,7 +74,7 @@ namespace v2rayN.Handler
             {
                 Global.statePort = GetFreePort();
 
-                channel_ = new Channel($"{Global.Loopback}:{Global.statePort}", ChannelCredentials.Insecure);
+                channel_ = new Channel($"127.0.0.1:{Global.statePort}", ChannelCredentials.Insecure);
                 channel_.ConnectAsync();
                 client_ = new StatsService.StatsServiceClient(channel_);
             }
@@ -212,7 +171,7 @@ namespace v2rayN.Handler
                     name = nStr[1];
                     type = nStr[3];
 
-                    if (name == Global.agentTag)
+                    if (name == Global.InboundProxyTagName)
                     {
                         if (type == "uplink")
                         {
@@ -254,7 +213,7 @@ namespace v2rayN.Handler
                     Utils.ToHumanReadable(TotalUp, out up_amount, out up_unit);
                     Utils.ToHumanReadable(TotalDown, out down_amount, out down_unit);
 
-                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
+                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToLongDateString()} {DateTime.Now.ToLongTimeString()}");
                     overallWriter.WriteLine($"UP {string.Format("{0:f2}", up_amount)}{up_unit} {TotalUp}");
                     overallWriter.WriteLine($"DOWN {string.Format("{0:f2}", down_amount)}{down_unit} {TotalDown}");
                     foreach (var s in Statistic)
@@ -269,7 +228,7 @@ namespace v2rayN.Handler
             }
 
             // 当天流量记录文件
-            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToLongDateString()}.txt");
             if (!File.Exists(dailyPath))
             {
                 File.Create(dailyPath);
@@ -278,7 +237,7 @@ namespace v2rayN.Handler
             {
                 using (var dailyWriter = new StreamWriter(dailyPath))
                 {
-                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
+                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToLongDateString()} {DateTime.Now.ToLongTimeString()}");
                     foreach (var s in Statistic)
                     {
                         dailyWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.todayUp} {s.todayDown}");
@@ -302,12 +261,11 @@ namespace v2rayN.Handler
             /// UP [readable string] [amount]
             /// DOWN [readable string] [amount]
             /// 每行每个数据空格分隔
-
-            try
+            ///
+            var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
+            if (File.Exists(overallPath))
             {
-                Utils.SaveLog(logPath_ + Global.StatisticLogOverall);
-                var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
-                if (File.Exists(overallPath))
+                try
                 {
                     using (var overallReader = new StreamReader(overallPath))
                     {
@@ -356,22 +314,20 @@ namespace v2rayN.Handler
                                 }
                             }
                         }
-
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-
-            try
-            {
-                Utils.SaveLog(logPath_ + $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
-                var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
-                if (File.Exists(dailyPath))
+                catch (Exception ex)
                 {
+                    Utils.SaveLog(ex.Message, ex);
+                }
+            }
 
+            // 当天流量记录文件
+            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToLongDateString()}.txt");
+            if (File.Exists(dailyPath))
+            {
+                try
+                {
                     using (var dailyReader = new StreamReader(dailyPath))
                     {
                         while (!dailyReader.EndOfStream)
@@ -409,10 +365,10 @@ namespace v2rayN.Handler
                         }
                     }
                 }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
             }
         }
 

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Net;
-using v2rayN.Base;
 using v2rayN.Mode;
+using System.Net;
+using System.Text;
+using System.Linq;
 
 namespace v2rayN.Handler
 {
@@ -159,7 +159,7 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    inbound.listen = Global.Loopback;
+                    inbound.listen = "127.0.0.1";
                 }
                 //开启udp
                 inbound.settings.udp = config.inbound[0].udpEnabled;
@@ -655,7 +655,7 @@ namespace v2rayN.Handler
                 if (!v2rayConfig.routing.rules.Exists(item => { return item.outboundTag == tag; }))
                 {
                     var apiRoutingRule = new Mode.RulesItem();
-                    apiRoutingRule.inboundTag = new List<string> { tag };
+                    apiRoutingRule.inboundTag = tag;
                     apiRoutingRule.outboundTag = tag;
                     apiRoutingRule.type = "field";
                     v2rayConfig.routing.rules.Add(apiRoutingRule);
@@ -688,21 +688,11 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
+                string addressFileName = config.address();
                 if (File.Exists(fileName))
                 {
                     File.Delete(fileName);
                 }
-
-                string addressFileName = config.address();
-                if (!File.Exists(addressFileName))
-                {
-                    addressFileName = Path.Combine(Utils.GetTempPath(), addressFileName);
-                }
-                if (!File.Exists(addressFileName))
-                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
-                    return -1;
-                }
                 File.Copy(addressFileName, fileName);
 
                 msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
@@ -1375,90 +1365,5 @@ namespace v2rayN.Handler
 
         #endregion
 
-        #region Gen speedtest config
-
-
-        public static int GenerateClientSpeedtestConfig(Config config, List<int> selecteds, string fileName, out string msg)
-        {
-            msg = string.Empty;
-
-            try
-            {
-                if (config == null
-                    || config.index < 0
-                    || config.vmess.Count <= 0
-                    || config.index > config.vmess.Count - 1
-                    )
-                {
-                    msg = UIRes.I18N("CheckServerSettings");
-                    return -1;
-                }
-
-                msg = UIRes.I18N("InitialConfiguration");
-
-                string result = Utils.GetEmbedText(SampleClient);
-                if (Utils.IsNullOrEmpty(result))
-                {
-                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
-                    return -1;
-                }
-
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
-                if (v2rayConfig == null)
-                {
-                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
-                    return -1;
-                }
-
-                log(config, ref v2rayConfig, false);
-                //routing(config, ref v2rayConfig);
-                dns(config, ref v2rayConfig);
-
-
-                var httpPort = config.GetLocalPort("speedtest");
-                for (int k = 0; k < selecteds.Count; k++)
-                {
-                    int index = selecteds[k];
-                    if (config.vmess[index].configType == (int)EConfigType.Custom)
-                    {
-                        continue;
-                    }
-
-                    config.index = index;
-
-                    var inbound = new Inbounds();
-                    inbound.listen = Global.Loopback;
-                    inbound.port = httpPort + index;
-                    inbound.protocol = Global.InboundHttp;
-                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
-                    v2rayConfig.inbounds.Add(inbound);
-
-
-                    var v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
-                    outbound(config, ref v2rayConfigCopy);
-                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
-                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
-
-                    var rule = new Mode.RulesItem();
-                    rule.inboundTag = new List<string> { inbound.tag };
-                    rule.outboundTag = v2rayConfigCopy.outbounds[0].tag;
-                    rule.type = "field";
-                    v2rayConfig.routing.rules.Add(rule);
-                }
-
-                Utils.ToJsonFile(v2rayConfig, fileName);
-
-                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
-            }
-            catch (Exception ex)
-            {
-                msg = UIRes.I18N("FailedGenDefaultConfiguration");
-                return -1;
-            }
-            return 0;
-        }
-
-        #endregion
-
     }
 }

v2rayN/v2rayN/Handler/V2rayHandler.cs

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

v2rayN/v2rayN/Handler/V2rayUpdateHandle.cs

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

v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs

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

v2rayN/v2rayN/HttpProxyHandler/HttpWebServer.cs

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

v2rayN/v2rayN/HttpProxyHandler/HttpWebServerB.cs

@@ -0,0 +1,132 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+
+namespace v2rayN.HttpProxyHandler
+{
+    public class HttpWebServerB
+    {
+        private int port;
+        private TcpListener listener;
+
+        private Func<TcpClient, string> _responderMethod;
+
+        public HttpWebServerB(int port, Func<TcpClient, string> method)
+        {
+            try
+            {
+                this.port = port;
+                this._responderMethod = method;
+
+                listener = new TcpListener(new IPEndPoint(IPAddress.Any, port));
+                listener.Server.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                listener.Start();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+
+            Utils.SaveLog("WebserverB running...");
+            AsyncCallback callback = null;
+            listener.BeginAcceptTcpClient(callback = ((ares) =>
+            {
+                try
+                {
+                    if (listener != null)
+                    {
+                        TcpClient tcpClient = listener.EndAcceptTcpClient(ares);
+                        listener.BeginAcceptTcpClient(callback, null);
+
+                        if (tcpClient != null && _responderMethod != null)
+                        {
+                            string pac = _responderMethod(tcpClient);
+
+                            NetworkStream netStream = tcpClient.GetStream();
+                            if (netStream.CanRead)
+                            {
+                                // Reads NetworkStream into a byte buffer.
+                                byte[] bytes = new byte[tcpClient.ReceiveBufferSize];
+
+                                // Read can return anything from 0 to numBytesToRead. 
+                                // This method blocks until at least one byte is read.
+                                netStream.Read(bytes, 0, (int)tcpClient.ReceiveBufferSize);
+
+                                // Returns the data received from the host to the console.
+                                string returndata = Encoding.UTF8.GetString(bytes);
+                                if (!Utils.IsNullOrEmpty(returndata)
+                                    && returndata.IndexOf("/pac/") >= 0
+                                    && netStream.CanWrite)
+                                {
+                                    BinaryWriter writer = new BinaryWriter(netStream);
+                                    //writeSuccess(writer, pac);
+
+                                    Byte[] sendBytes = Encoding.UTF8.GetBytes(writeSuccess(pac));
+                                    writer.Write(sendBytes, 0, sendBytes.Length);
+                                    writer.Flush();
+
+                                    writer.Close();
+                                }
+                            }
+
+                            netStream.Close();
+                            tcpClient.Close();
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
+                //Console.WriteLine("Client connected completed");
+
+            }), null);
+        }
+
+
+        public void Stop()
+        {
+            if (listener != null)
+            {
+                listener.Stop();
+                listener = null;
+            }
+        }
+        
+
+        //private static void writeSuccess(BinaryWriter writer, string pac)
+        //{
+        //    writer.Write("HTTP/1.0 200 OK");
+        //    writer.Write(Environment.NewLine);
+        //    writer.Write("Content-Type:application/x-ns-proxy-autoconfig; charset=UTF-8");
+        //    writer.Write(Environment.NewLine);
+        //    writer.Write("Content-Length: " + pac.Length);
+        //    writer.Write(Environment.NewLine);
+        //    writer.Write(Environment.NewLine);
+        //    writer.Write(pac);
+        //    writer.Flush();
+
+        //}
+
+        private static string writeSuccess(string pac)
+        {
+            StringBuilder sb = new StringBuilder();
+            string content_type = "application/x-ns-proxy-autoconfig";
+
+            sb.Append("HTTP/1.0 200 OK");
+            sb.AppendLine();
+            sb.Append(String.Format("Content-Type:{0};charset=utf-8", content_type));
+            sb.AppendLine();
+            //sb.Append("Connection: close");
+            //sb.AppendLine();
+            sb.Append(pac);
+            sb.AppendLine();
+
+            return sb.ToString();
+        }
+
+    }
+}

v2rayN/v2rayN/HttpProxyHandler/PACFileWatcherHandle.cs

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

v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 
@@ -29,13 +28,13 @@ namespace v2rayN.HttpProxyHandler
             }
         }
 
-
+        private const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
 
         private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
 
         public void UpdatePACFromGFWList(Config config)
         {
-            string url = Global.GFWLIST_URL;
+            string url = GFWLIST_URL;
             if (!Utils.IsNullOrEmpty(config.urlGFWList))
             {
                 url = config.urlGFWList;
@@ -47,7 +46,7 @@ namespace v2rayN.HttpProxyHandler
             //{
             //    throw new Exception("未发现HTTP代理，无法设置代理更新");
             //}
-            var http = new WebClientEx();
+            WebClient http = new WebClient();
             //http.Headers.Add("Connection", "Close");
             //http.Proxy = new WebProxy(IPAddress.Loopback.ToString(), httpProxy.localPort);
             http.DownloadStringCompleted += http_DownloadStringCompleted;
@@ -76,7 +75,7 @@ namespace v2rayN.HttpProxyHandler
         public static List<string> ParseResult(string response)
         {
             byte[] bytes = Convert.FromBase64String(response);
-            string content = Encoding.UTF8.GetString(bytes);
+            string content = Encoding.ASCII.GetString(bytes);
             List<string> valid_lines = new List<string>();
             using (var sr = new StringReader(content))
             {

v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
+using System.Net.Sockets;
 using System.Text;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
-using v2rayN.Base;
 
 namespace v2rayN.HttpProxyHandler
 {
@@ -18,38 +19,19 @@ namespace v2rayN.HttpProxyHandler
         private static HttpWebServer server;
         private static HttpWebServerB serverB;
 
-        public static bool IsRunning
-        {
-            get
-            {
-                return (pacPort > 0);
-            }
-        }
-
         public static void Init(Config config)
         {
-            Global.pacPort = config.GetLocalPort("pac");
-
-            if (InitServer("*"))
+            if (Utils.IsAdministrator())
             {
-                pacPort = Global.pacPort;
-            }
-            //else if (InitServer(Global.Loopback))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            else if (InitServerB(Global.Loopback))
-            {
-                pacPort = Global.pacPort;
+                InitServer("127.0.0.1");
             }
             else
             {
-                Utils.SaveLog("Webserver init failed ");
-                pacPort = 0;
+                InitServerB("127.0.0.1");
             }
         }
 
-        private static bool InitServer(string address)
+        public static void InitServer(string address)
         {
             try
             {
@@ -63,12 +45,13 @@ namespace v2rayN.HttpProxyHandler
 
                     if (server == null)
                     {
-                        string prefixes = string.Format("http://{0}:{1}/pac/", address, Global.pacPort);
+                        string prefixes = string.Format("http://{0}:{1}/pac/", "+", Global.pacPort);
                         Utils.SaveLog("Webserver prefixes " + prefixes);
 
-                        server = new HttpWebServer(SendResponse, prefixes);
-                        server.Run();
+                        HttpWebServer ws = new HttpWebServer(SendResponse, prefixes);
+                        ws.Run();
 
+                        pacPort = Global.pacPort;
                     }
                 }
                 Utils.SaveLog("Webserver at " + address);
@@ -76,12 +59,11 @@ namespace v2rayN.HttpProxyHandler
             catch (Exception ex)
             {
                 Utils.SaveLog("Webserver InitServer " + ex.Message);
-                return false;
             }
-            return true;
         }
 
-        public static bool InitServerB(string address)
+
+        public static void InitServerB(string address)
         {
             try
             {
@@ -96,22 +78,22 @@ namespace v2rayN.HttpProxyHandler
                     if (serverB == null)
                     {
                         serverB = new HttpWebServerB(Global.pacPort, SendResponse);
+                        pacPort = Global.pacPort;
                     }
                 }
-                Utils.SaveLog("WebserverB at " + address);
+                Utils.SaveLog("Webserver at " + address);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("WebserverB InitServer " + ex.Message);
-                return false;
+                Utils.SaveLog("Webserver InitServer " + ex.Message);
             }
-            return true;
         }
 
-        public static string SendResponse(string address)
+        public static string SendResponse(HttpListenerRequest request)
         {
             try
             {
+                string address = request.LocalEndPoint.Address.ToString();
                 var pac = GetPacList(address);
                 return pac;
             }
@@ -121,26 +103,42 @@ namespace v2rayN.HttpProxyHandler
                 return ex.Message;
             }
         }
+        
 
-        public static void Stop()
+        public static string SendResponse(TcpClient tcpClient)
         {
             try
             {
-                if (server != null)
-                {
-                    server.Stop();
-                    server = null;
-                }
-                if (serverB != null)
-                {
-                    serverB.Stop();
-                    serverB = null;
-                }
+                var address = ((IPEndPoint)tcpClient.Client.LocalEndPoint).Address.ToString();
+                var pac = GetPacList(address);
+
+                Console.WriteLine("SendResponse addr " + address);
+                //Utils.SaveLog("SendResponse addr " + address);
+                
+                return pac;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("Webserver Stop " + ex.Message);
+                Utils.SaveLog(ex.Message, ex);
             }
+            return "";
+        }
+
+
+        public static void Stop()
+        {
+            //try
+            //{
+            //    if (server != null)
+            //    {
+            //        server.Stop();
+            //        server = null;
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    Utils.SaveLog("Webserver Stop " + ex.Message);
+            //}
 
             //try
             //{
@@ -161,10 +159,9 @@ namespace v2rayN.HttpProxyHandler
             //}
         }
 
-
         private static string GetPacList(string address)
         {
-            var port = Global.httpPort;
+            var port = Global.sysAgentPort;
             if (port <= 0)
             {
                 return "No port";
@@ -185,10 +182,8 @@ namespace v2rayN.HttpProxyHandler
                 return pac;
             }
             catch
-            {
-            }
+            { }
             return "No pac content";
         }
-
     }
 }

v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs

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

v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs

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

v2rayN/v2rayN/HttpProxyHandler/WebClientEx.cs

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

v2rayN/v2rayN/Mode/Config.cs

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

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -310,7 +310,7 @@ namespace v2rayN.Mode
         /// </summary>
         public string port { get; set; }
 
-        public List<string> inboundTag { get; set; }
+        public string inboundTag { get; set; }
         /// <summary>
         /// 
         /// </summary>

v2rayN/v2rayN/Properties/AssemblyInfo.cs

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

v2rayN/v2rayN/Properties/Resources.Designer.cs

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

v2rayN/v2rayN/Properties/Resources.resx

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

v2rayN/v2rayN/Resources/privoxy_conf.txt

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

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace v2rayN.Resx {
     
     
     /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class ResUI {
@@ -33,7 +33,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Batch export subscription to clipboard successfully.
         /// </summary>
         internal static string BatchExportSubscriptionSuccessfully {
             get {
@@ -70,7 +70,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Batch export share URL to clipboard successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Batch export share URL to clipboard successfully.
         /// </summary>
         internal static string BatchExportURLSuccessfully {
             get {
@@ -79,7 +79,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please check the server settings first 的本地化字符串。
+        ///   Looks up a localized string similar to Please check the server settings first.
         /// </summary>
         internal static string CheckServerSettings {
             get {
@@ -88,7 +88,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  configuration format is incorrect 的本地化字符串。
+        ///   Looks up a localized string similar to  configuration format is incorrect.
         /// </summary>
         internal static string ConfigurationFormatIncorrect {
             get {
@@ -97,7 +97,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound. 的本地化字符串。
+        ///   Looks up a localized string similar to Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound..
         /// </summary>
         internal static string CustomServerTips {
             get {
@@ -106,7 +106,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 DOWN 的本地化字符串。
+        ///   Looks up a localized string similar to DOWN.
         /// </summary>
         internal static string downloadSpeed {
             get {
@@ -115,7 +115,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Whether to download? {0} 的本地化字符串。
+        ///   Looks up a localized string similar to Whether to download? {0}.
         /// </summary>
         internal static string DownloadYesNo {
             get {
@@ -124,7 +124,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to convert configuration file 的本地化字符串。
+        ///   Looks up a localized string similar to Failed to convert configuration file.
         /// </summary>
         internal static string FailedConversionConfiguration {
             get {
@@ -133,7 +133,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to generate default configuration file 的本地化字符串。
+        ///   Looks up a localized string similar to Failed to generate default configuration file.
         /// </summary>
         internal static string FailedGenDefaultConfiguration {
             get {
@@ -142,7 +142,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  Failed to get the default configuration 的本地化字符串。
+        ///   Looks up a localized string similar to  Failed to get the default configuration.
         /// </summary>
         internal static string FailedGetDefaultConfiguration {
             get {
@@ -151,7 +151,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to import custom configuration server 的本地化字符串。
+        ///   Looks up a localized string similar to Failed to import custom configuration server.
         /// </summary>
         internal static string FailedImportedCustomServer {
             get {
@@ -160,7 +160,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to read configuration file 的本地化字符串。
+        ///   Looks up a localized string similar to Failed to read configuration file.
         /// </summary>
         internal static string FailedReadConfiguration {
             get {
@@ -169,7 +169,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the correct format extra ID 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the correct format extra ID.
         /// </summary>
         internal static string FillCorrectAlterId {
             get {
@@ -178,7 +178,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the correct format server port 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the correct format server port.
         /// </summary>
         internal static string FillCorrectServerPort {
             get {
@@ -187,7 +187,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the KCP parameters correctly 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the KCP parameters correctly.
         /// </summary>
         internal static string FillKcpParameters {
             get {
@@ -196,7 +196,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the local listening port 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the local listening port.
         /// </summary>
         internal static string FillLocalListeningPort {
             get {
@@ -205,7 +205,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the password 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the password.
         /// </summary>
         internal static string FillPassword {
             get {
@@ -214,7 +214,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the server address 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the server address.
         /// </summary>
         internal static string FillServerAddress {
             get {
@@ -223,7 +223,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the user ID 的本地化字符串。
+        ///   Looks up a localized string similar to Please fill in the user ID.
         /// </summary>
         internal static string FillUUID {
             get {
@@ -232,7 +232,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct client configuration file, please check 的本地化字符串。
+        ///   Looks up a localized string similar to  is not the correct client configuration file, please check.
         /// </summary>
         internal static string IncorrectClientConfiguration {
             get {
@@ -241,7 +241,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct configuration, please check 的本地化字符串。
+        ///   Looks up a localized string similar to  is not the correct configuration, please check.
         /// </summary>
         internal static string Incorrectconfiguration {
             get {
@@ -250,7 +250,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct server configuration file, please check 的本地化字符串。
+        ///   Looks up a localized string similar to  is not the correct server configuration file, please check.
         /// </summary>
         internal static string IncorrectServerConfiguration {
             get {
@@ -259,7 +259,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Initial Configuration 的本地化字符串。
+        ///   Looks up a localized string similar to Initial Configuration.
         /// </summary>
         internal static string InitialConfiguration {
             get {
@@ -268,7 +268,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Address 的本地化字符串。
+        ///   Looks up a localized string similar to Address.
         /// </summary>
         internal static string LvAddress {
             get {
@@ -277,7 +277,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Alias 的本地化字符串。
+        ///   Looks up a localized string similar to Alias.
         /// </summary>
         internal static string LvAlias {
             get {
@@ -286,7 +286,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Security 的本地化字符串。
+        ///   Looks up a localized string similar to Security.
         /// </summary>
         internal static string LvEncryptionMethod {
             get {
@@ -295,7 +295,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Port 的本地化字符串。
+        ///   Looks up a localized string similar to Port.
         /// </summary>
         internal static string LvPort {
             get {
@@ -304,7 +304,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Type 的本地化字符串。
+        ///   Looks up a localized string similar to Type.
         /// </summary>
         internal static string LvServiceType {
             get {
@@ -313,7 +313,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subs 的本地化字符串。
+        ///   Looks up a localized string similar to Subs.
         /// </summary>
         internal static string LvSubscription {
             get {
@@ -322,7 +322,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test Results 的本地化字符串。
+        ///   Looks up a localized string similar to Test Results.
         /// </summary>
         internal static string LvTestResults {
             get {
@@ -331,7 +331,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Today download traffic 的本地化字符串。
+        ///   Looks up a localized string similar to Today download traffic.
         /// </summary>
         internal static string LvTodayDownloadDataAmount {
             get {
@@ -340,7 +340,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Today upload traffic 的本地化字符串。
+        ///   Looks up a localized string similar to Today upload traffic.
         /// </summary>
         internal static string LvTodayUploadDataAmount {
             get {
@@ -349,7 +349,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Total download traffic 的本地化字符串。
+        ///   Looks up a localized string similar to Total download traffic.
         /// </summary>
         internal static string LvTotalDownloadDataAmount {
             get {
@@ -358,7 +358,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Total upload traffic 的本地化字符串。
+        ///   Looks up a localized string similar to Total upload traffic.
         /// </summary>
         internal static string LvTotalUploadDataAmount {
             get {
@@ -367,7 +367,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Transport 的本地化字符串。
+        ///   Looks up a localized string similar to Transport.
         /// </summary>
         internal static string LvTransportProtocol {
             get {
@@ -376,7 +376,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 MediumFresh 的本地化字符串。
+        ///   Looks up a localized string similar to MediumFresh.
         /// </summary>
         internal static string MediumFresh {
             get {
@@ -385,7 +385,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Clear original subscription content 的本地化字符串。
+        ///   Looks up a localized string similar to Clear original subscription content.
         /// </summary>
         internal static string MsgClearSubscription {
             get {
@@ -394,7 +394,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Download V2rayCore successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Download V2rayCore successfully.
         /// </summary>
         internal static string MsgDownloadV2rayCoreSuccessfully {
             get {
@@ -403,7 +403,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to import subscription content 的本地化字符串。
+        ///   Looks up a localized string similar to Failed to import subscription content.
         /// </summary>
         internal static string MsgFailedImportSubscription {
             get {
@@ -412,7 +412,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Get the subscription content successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Get the subscription content successfully.
         /// </summary>
         internal static string MsgGetSubscriptionSuccessfully {
             get {
@@ -421,7 +421,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 No valid subscriptions set 的本地化字符串。
+        ///   Looks up a localized string similar to No valid subscriptions set.
         /// </summary>
         internal static string MsgNoValidSubscription {
             get {
@@ -430,7 +430,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 PAC update failed 的本地化字符串。
+        ///   Looks up a localized string similar to PAC update failed.
         /// </summary>
         internal static string MsgPACUpdateFailed {
             get {
@@ -439,7 +439,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 PAC update succeeded 的本地化字符串。
+        ///   Looks up a localized string similar to PAC update succeeded.
         /// </summary>
         internal static string MsgPACUpdateSuccessfully {
             get {
@@ -448,7 +448,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Resolve V2rayCore successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Resolve V2rayCore successfully.
         /// </summary>
         internal static string MsgParsingV2rayCoreSuccessfully {
             get {
@@ -457,7 +457,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Simplify PAC Success 的本地化字符串。
+        ///   Looks up a localized string similar to Simplify PAC Success.
         /// </summary>
         internal static string MsgSimplifyPAC {
             get {
@@ -466,7 +466,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Start getting subscriptions 的本地化字符串。
+        ///   Looks up a localized string similar to Start getting subscriptions.
         /// </summary>
         internal static string MsgStartGettingSubscriptions {
             get {
@@ -475,7 +475,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Start updating PAC... 的本地化字符串。
+        ///   Looks up a localized string similar to Start updating PAC....
         /// </summary>
         internal static string MsgStartUpdatingPAC {
             get {
@@ -484,7 +484,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Start updating V2rayCore... 的本地化字符串。
+        ///   Looks up a localized string similar to Start updating V2rayCore....
         /// </summary>
         internal static string MsgStartUpdatingV2rayCore {
             get {
@@ -493,7 +493,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription content decoding failed (non-BASE64 code) 的本地化字符串。
+        ///   Looks up a localized string similar to Subscription content decoding failed (non-BASE64 code).
         /// </summary>
         internal static string MsgSubscriptionDecodingFailed {
             get {
@@ -502,7 +502,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 is unpacking... 的本地化字符串。
+        ///   Looks up a localized string similar to is unpacking....
         /// </summary>
         internal static string MsgUnpacking {
             get {
@@ -511,7 +511,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription end 的本地化字符串。
+        ///   Looks up a localized string similar to Update subscription end.
         /// </summary>
         internal static string MsgUpdateSubscriptionEnd {
             get {
@@ -520,7 +520,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription starts 的本地化字符串。
+        ///   Looks up a localized string similar to Update subscription starts.
         /// </summary>
         internal static string MsgUpdateSubscriptionStart {
             get {
@@ -529,7 +529,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update V2rayCore successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Update V2rayCore successfully.
         /// </summary>
         internal static string MsgUpdateV2rayCoreSuccessfully {
             get {
@@ -538,7 +538,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update V2rayCore successfully! Restarting service... 的本地化字符串。
+        ///   Looks up a localized string similar to Update V2rayCore successfully! Restarting service....
         /// </summary>
         internal static string MsgUpdateV2rayCoreSuccessfullyMore {
             get {
@@ -547,7 +547,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  This feature relies on the Http global proxy, please set it correctly first. 的本地化字符串。
+        ///   Looks up a localized string similar to  This feature relies on the Http global proxy, please set it correctly first..
         /// </summary>
         internal static string NeedHttpGlobalProxy {
             get {
@@ -556,7 +556,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Non-vmess or ss protocol 的本地化字符串。
+        ///   Looks up a localized string similar to Non-vmess or ss protocol.
         /// </summary>
         internal static string NonvmessOrssProtocol {
             get {
@@ -565,7 +565,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  non-Vmess service, this feature is invalid 的本地化字符串。
+        ///   Looks up a localized string similar to  non-Vmess service, this feature is invalid.
         /// </summary>
         internal static string NonVmessService {
             get {
@@ -574,7 +574,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 V2ray-core not found, download address: {0} 的本地化字符串。
+        ///   Looks up a localized string similar to V2ray-core not found, download address: {0}.
         /// </summary>
         internal static string NotFoundCore {
             get {
@@ -583,7 +583,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Scan completed, no valid QR code found 的本地化字符串。
+        ///   Looks up a localized string similar to Scan completed, no valid QR code found.
         /// </summary>
         internal static string NoValidQRcodeFound {
             get {
@@ -592,7 +592,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  operation failed, please check retry 的本地化字符串。
+        ///   Looks up a localized string similar to  operation failed, please check retry.
         /// </summary>
         internal static string OperationFailed {
             get {
@@ -601,7 +601,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please Fill Remarks 的本地化字符串。
+        ///   Looks up a localized string similar to Please Fill Remarks.
         /// </summary>
         internal static string PleaseFillRemarks {
             get {
@@ -610,7 +610,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select the encryption method 的本地化字符串。
+        ///   Looks up a localized string similar to Please select the encryption method.
         /// </summary>
         internal static string PleaseSelectEncryption {
             get {
@@ -619,7 +619,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select an agreement 的本地化字符串。
+        ///   Looks up a localized string similar to Please select an agreement.
         /// </summary>
         internal static string PleaseSelectProtocol {
             get {
@@ -628,7 +628,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select the server first 的本地化字符串。
+        ///   Looks up a localized string similar to Please select the server first.
         /// </summary>
         internal static string PleaseSelectServer {
             get {
@@ -637,7 +637,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 QuickFresh 的本地化字符串。
+        ///   Looks up a localized string similar to QuickFresh.
         /// </summary>
         internal static string QuickFresh {
             get {
@@ -646,7 +646,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Are you sure to remove the server? 的本地化字符串。
+        ///   Looks up a localized string similar to Are you sure to remove the server?.
         /// </summary>
         internal static string RemoveServer {
             get {
@@ -655,7 +655,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 The client configuration file is saved at: {0} 的本地化字符串。
+        ///   Looks up a localized string similar to The client configuration file is saved at: {0}.
         /// </summary>
         internal static string SaveClientConfigurationIn {
             get {
@@ -664,7 +664,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 The server configuration file is saved at: {0} 的本地化字符串。
+        ///   Looks up a localized string similar to The server configuration file is saved at: {0}.
         /// </summary>
         internal static string SaveServerConfigurationIn {
             get {
@@ -673,7 +673,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 SlowFresh 的本地化字符串。
+        ///   Looks up a localized string similar to SlowFresh.
         /// </summary>
         internal static string SlowFresh {
             get {
@@ -682,7 +682,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! 的本地化字符串。
+        ///   Looks up a localized string similar to Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!.
         /// </summary>
         internal static string SpeedServerTips {
             get {
@@ -691,16 +691,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。
-        /// </summary>
-        internal static string StartPacFailed {
-            get {
-                return ResourceManager.GetString("StartPacFailed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Start service ({0})...... 的本地化字符串。
+        ///   Looks up a localized string similar to Start service ({0}).......
         /// </summary>
         internal static string StartService {
             get {
@@ -709,8 +700,8 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Successful configuration
-        ///{0} 的本地化字符串。
+        ///   Looks up a localized string similar to Successful configuration
+        ///{0}.
         /// </summary>
         internal static string SuccessfulConfiguration {
             get {
@@ -719,7 +710,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Successfully imported custom configuration server 的本地化字符串。
+        ///   Looks up a localized string similar to Successfully imported custom configuration server.
         /// </summary>
         internal static string SuccessfullyImportedCustomServer {
             get {
@@ -728,7 +719,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Imported bulk URL from clipboard successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Imported bulk URL from clipboard successfully.
         /// </summary>
         internal static string SuccessfullyImportedServerViaClipboard {
             get {
@@ -737,12 +728,21 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Scan import URL successfully 的本地化字符串。
+        ///   Looks up a localized string similar to Scan import URL successfully.
         /// </summary>
         internal static string SuccessfullyImportedServerViaScan {
             get {
                 return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to UP.
+        /// </summary>
+        internal static string uploadSpeed {
+            get {
+                return ResourceManager.GetString("uploadSpeed", resourceCulture);
+            }
+        }
     }
 }

v2rayN/v2rayN/Resx/ResUI.resx

@@ -343,7 +343,7 @@
   <data name="LvTotalUploadDataAmount" xml:space="preserve">
     <value>Total upload traffic</value>
   </data>
-  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC failed to start. Pls with an administrator.</value>
+  <data name="uploadSpeed" xml:space="preserve">
+    <value>UP</value>
   </data>
 </root>

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

@@ -343,7 +343,7 @@
   <data name="LvTotalUploadDataAmount" xml:space="preserve">
     <value>总上传</value>
   </data>
-  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC服务启动失败,请用管理员启动</value>
+  <data name="uploadSpeed" xml:space="preserve">
+    <value>上传</value>
   </data>
 </root>

v2rayN/v2rayN/Sample/SampleClientConfig.txt

@@ -76,7 +76,7 @@
 		"domainStrategy": "IPIfNonMatch",
 		"rules": [
 				{
-                    "inboundTag": ["api"],
+                    "inboundTag": "api",
                     "outboundTag": "api",
                     "type": "field"
                 }

v2rayN/v2rayN/Sample/custom_routing_block

@@ -1 +0,0 @@
-geosite:category-ads,

v2rayN/v2rayN/Sample/custom_routing_direct

@@ -1,132 +0,0 @@
-domain:12306.com,
-domain:51ym.me,
-domain:52pojie.cn,
-domain:8686c.com,
-domain:abercrombie.com,
-domain:adobesc.com,
-domain:air-matters.com,
-domain:air-matters.io,
-domain:airtable.com,
-domain:akadns.net,
-domain:apache.org,
-domain:api.crisp.chat,
-domain:api.termius.com,
-domain:appshike.com,
-domain:appstore.com,
-domain:aweme.snssdk.com,
-domain:bababian.com,
-domain:battle.net,
-domain:beatsbydre.com,
-domain:bet365.com,
-domain:bilibili.cn,
-domain:ccgslb.com,
-domain:ccgslb.net,
-domain:chunbo.com,
-domain:chunboimg.com,
-domain:clashroyaleapp.com,
-domain:cloudsigma.com,
-domain:cloudxns.net,
-domain:cmfu.com,
-domain:culturedcode.com,
-domain:dct-cloud.com,
-domain:didialift.com,
-domain:douyutv.com,
-domain:duokan.com,
-domain:dytt8.net,
-domain:easou.com,
-domain:ecitic.net,
-domain:eclipse.org,
-domain:eudic.net,
-domain:ewqcxz.com,
-domain:fir.im,
-domain:frdic.com,
-domain:fresh-ideas.cc,
-domain:godic.net,
-domain:goodread.com,
-domain:haibian.com,
-domain:hdslb.net,
-domain:hollisterco.com,
-domain:hongxiu.com,
-domain:hxcdn.net,
-domain:images.unsplash.com,
-domain:img4me.com,
-domain:ipify.org,
-domain:ixdzs.com,
-domain:jd.hk,
-domain:jianshuapi.com,
-domain:jomodns.com,
-domain:jsboxbbs.com,
-domain:knewone.com,
-domain:kuaidi100.com,
-domain:lemicp.com,
-domain:letvcloud.com,
-domain:lizhi.io,
-domain:localizecdn.com,
-domain:lucifr.com,
-domain:luoo.net,
-domain:mai.tn,
-domain:maven.org,
-domain:miwifi.com,
-domain:moji.com,
-domain:moke.com,
-domain:mtalk.google.com,
-domain:mxhichina.com,
-domain:myqcloud.com,
-domain:myunlu.com,
-domain:netease.com,
-domain:nfoservers.com,
-domain:nssurge.com,
-domain:nuomi.com,
-domain:ourdvs.com,
-domain:overcast.fm,
-domain:paypal.com,
-domain:paypalobjects.com,
-domain:pgyer.com,
-domain:qdaily.com,
-domain:qdmm.com,
-domain:qin.io,
-domain:qingmang.me,
-domain:qingmang.mobi,
-domain:qqurl.com,
-domain:rarbg.to,
-domain:rrmj.tv,
-domain:ruguoapp.com,
-domain:sm.ms,
-domain:snwx.com,
-domain:soku.com,
-domain:startssl.com,
-domain:store.steampowered.com,
-domain:symcd.com,
-domain:teamviewer.com,
-domain:tmzvps.com,
-domain:trello.com,
-domain:trellocdn.com,
-domain:ttmeiju.com,
-domain:udache.com,
-domain:uxengine.net,
-domain:weather.bjango.com,
-domain:weather.com,
-domain:webqxs.com,
-domain:weico.cc,
-domain:wenku8.net,
-domain:werewolf.53site.com,
-domain:windowsupdate.com,
-domain:wkcdn.com,
-domain:workflowy.com,
-domain:xdrig.com,
-domain:xiaojukeji.com,
-domain:xiaomi.net,
-domain:xiaomicp.com,
-domain:ximalaya.com,
-domain:xitek.com,
-domain:xmcdn.com,
-domain:xslb.net,
-domain:xteko.com,
-domain:yach.me,
-domain:yixia.com,
-domain:yunjiasu-cdn.net,
-domain:zealer.com,
-domain:zgslb.net,
-domain:zimuzu.tv,
-domain:zmz002.com,
-domain:samsungdm.com,

v2rayN/v2rayN/Sample/custom_routing_proxy

@@ -1,33 +0,0 @@
-geosite:google,
-geosite:github,
-geosite:netflix,
-geosite:steam,
-geosite:telegram,
-geosite:tumblr,
-geosite:speedtest,
-geosite:bbc,
-domain:gvt1.com,
-domain:textnow.com,
-domain:twitch.tv,
-domain:wikileaks.org,
-domain:naver.com,
-91.108.4.0/22,
-91.108.8.0/22,
-91.108.12.0/22,
-91.108.20.0/22,
-91.108.36.0/23,
-91.108.38.0/23,
-91.108.56.0/22,
-149.154.160.0/20,
-149.154.164.0/22,
-149.154.172.0/22,
-74.125.0.0/16,
-173.194.0.0/16,
-172.217.0.0/16,
-216.58.200.0/24,
-216.58.220.0/24,
-91.108.56.116,
-91.108.56.0/24,
-109.239.140.0/24,
-149.154.167.0/24,
-149.154.175.0/24,

v2rayN/v2rayN/StringEx.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     static class StringEx
     {

v2rayN/v2rayN/Tool/Utils.cs

@@ -18,7 +18,6 @@ using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
 using System.Security.Principal;
-using v2rayN.Base;
 
 namespace v2rayN
 {

v2rayN/v2rayN/packages.config

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

v2rayN/v2rayN/v2rayN.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" />
+  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -114,7 +114,6 @@
       <HintPath>LIB\System.Memory.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Messaging" />
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -141,7 +140,7 @@
     <Compile Include="Forms\AddServer4Form.Designer.cs">
       <DependentUpon>AddServer4Form.cs</DependentUpon>
     </Compile>
-    <Compile Include="Base\ListViewFlickerFree.cs">
+    <Compile Include="Forms\ListViewFlickerFree.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Forms\MainForm.cs">
@@ -150,12 +149,6 @@
     <Compile Include="Forms\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\RoutingRuleSettingForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\RoutingRuleSettingForm.Designer.cs">
-      <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\SubSettingForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -186,29 +179,24 @@
     <Compile Include="Forms\SubSettingControl.Designer.cs">
       <DependentUpon>SubSettingControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="Handler\SpeedtestHandler.cs" />
     <Compile Include="Handler\StatisticsHandler.cs" />
-    <Compile Include="Handler\DownloadHandle.cs" />
-    <Compile Include="Base\HttpWebServer.cs" />
-    <Compile Include="Base\HttpWebServerB.cs" />
+    <Compile Include="Handler\V2rayUpdateHandle.cs" />
+    <Compile Include="HttpProxyHandler\HttpWebServer.cs" />
+    <Compile Include="HttpProxyHandler\HttpWebServerB.cs" />
+    <Compile Include="HttpProxyHandler\PACFileWatcherHandle.cs" />
     <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
     <Compile Include="HttpProxyHandler\PACListHandle.cs" />
     <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
     <Compile Include="HttpProxyHandler\ProxySetting.cs" />
     <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
     <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="Base\WebClientEx.cs">
+    <Compile Include="HttpProxyHandler\WebClientEx.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Mode\EMove.cs" />
     <Compile Include="Mode\ServerStatistics.cs" />
     <Compile Include="Mode\SysproxyConfig.cs" />
     <Compile Include="Mode\EConfigType.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -219,7 +207,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ResUI.resx</DependentUpon>
     </Compile>
-    <Compile Include="Base\StringEx.cs">
+    <Compile Include="StringEx.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Forms\AddServerForm.cs">
@@ -292,9 +280,6 @@
       <DependentUpon>QRCodeControl.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\RoutingRuleSettingForm.resx">
-      <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SubSettingControl.resx">
       <DependentUpon>SubSettingControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -333,9 +318,14 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <EmbeddedResource Include="app.config">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -349,13 +339,8 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <EmbeddedResource Include="Sample\custom_routing_block" />
-    <EmbeddedResource Include="Sample\custom_routing_direct" />
-    <EmbeddedResource Include="Sample\custom_routing_proxy" />
     <Protobuf Include="Protos\Statistics.proto" />
     <None Include="Resources\abp.js.gz" />
-    <None Include="Resources\grpc_csharp_ext.x64.dll.gz" />
-    <None Include="Resources\grpc_csharp_ext.x86.dll.gz" />
     <None Include="Resources\pac.txt.gz" />
     <None Include="Resources\sysproxy.exe.gz" />
     <None Include="Resources\sysproxy64.exe.gz" />
@@ -406,6 +391,7 @@
     <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\mgwz.dll.gz" />
     <None Include="Resources\privoxy.exe.gz" />
     <None Include="Resources\restart.png" />
   </ItemGroup>
@@ -433,9 +419,14 @@
     <EmbeddedResource Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
     <EmbeddedResource Include="LIB\zxing.dll" />
     <EmbeddedResource Include="LIB\zxing.presentation.dll" />
+    <Content Include="grpc_csharp_ext.x64.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="grpc_csharp_ext.x86.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <EmbeddedResource Include="LIB\netstandard.dll" />
     <Content Include="Resources\help.png" />
-    <None Include="Resources\notify.png" />
     <Content Include="Resources\privoxy_conf.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -446,12 +437,12 @@
   <Import Project="..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.2.23.0\build\net45\Grpc.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.props'))" />
-    <Error Condition="!Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.props'))" />
+    <Error Condition="!Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets'))" />
   </Target>
-  <Import Project="..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.24.0\build\Grpc.Tools.targets')" />
+  <Import Project="..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.2.23.0\build\Grpc.Tools.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">