Update UpdateChecker.cs

extract RedirectorConfig
move BypassIPs to Setting.TUNTAP

.github/dependabot.yml

@@ -26,8 +26,7 @@ updates:
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:
-      interval: "weekly"
-      day: "monday"
+      interval: "daily"
       time: "07:15"
       timezone: "Asia/Shanghai"
     labels:

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: Netch CI
+on: 
+  push:
+    branches-ignore:
+      dependabot/**
+  pull_request:
+jobs:
+  build:
+    name: Build
+    runs-on: windows-latest
+    steps:
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Build Solution
+      shell: pwsh
+      run: .\BUILD.ps1
+
+    - name: Upload Artifact
+      continue-on-error: true
+      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: Netch
+        path: Netch\bin\x64\Release

.github/workflows/release.yml

@@ -1,5 +1,8 @@
-name: Netch CI
-on: [push, pull_request]
+name: Netch Release
+on:
+  push:
+    tags:
+    - '*.*'
 jobs:
   build:
     name: Build
@@ -15,34 +18,24 @@ jobs:
 
     - name: Build Solution
       shell: pwsh
-      run: .\BUILD.ps1
-
-    - name: Upload Artifact
-      continue-on-error: true
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: Netch
-        path: Netch\bin\x64\Release
+      run: .\PUBLISH.ps1
 
     - name: Package
       if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
       shell: pwsh
       run: |
         New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
-        7z a -mx9 C:\builtfiles\Netch.7z .\Netch\bin\x64\Release\
-        7z rn C:\builtfiles\Netch.7z Release Netch
+        7z a -mx9 C:\builtfiles\Netch.7z .\Netch\bin\Publish\
+        7z rn C:\builtfiles\Netch.7z Publish Netch
         echo "Netch_SHA256=$(.\GetSHA256.ps1 C:\builtfiles\Netch.7z)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        echo "Netch_EXE_SHA256=$(.\GetSHA256.ps1 Netch\bin\x64\Release\Netch.exe)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo "Netch_EXE_SHA256=$(.\GetSHA256.ps1 Netch\bin\Publish\Netch.exe)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
     - name: Release
       uses: softprops/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
       with:
-        name: ${{ env.GITHUB_TAG_NAME }}
-        prerelease: true
+        prerelease: ${{ contains(github.ref, '-') }}
         draft: false
         files: |
           C:\builtfiles\Netch.7z
@@ -55,4 +48,4 @@ jobs:
           ## 校验和
           | 文件名 | SHA256 |
           | :- | :- |
-          | Netch.7z | ${{ env.Netch_SHA256 }} |
+          | Netch.7z | ${{ env.Netch_SHA256 }} |

.gitignore

@@ -1,4 +1,5 @@
-/.vs
-/packages
+.vs/
 .idea/
-/*.user
+*/bin/
+*/obj/
+*.csproj.user

BUILD.ps1

@@ -1,10 +1,8 @@
 Write-Host 'Building'
 
-msbuild -v:n /p:Configuration="Release" `
-	/p:Platform="x64" `
-	/p:TargetFramework=net48 `
-	/p:SolutionDir="$pwd\" `
-	/restore `
+dotnet build `
+	-c "Release" `
+	-p:Platform="x64" `
 	Netch\Netch.csproj
 
 if ($LASTEXITCODE) { exit $LASTEXITCODE } 

CLEAN.ps1

@@ -1,21 +0,0 @@
-if (Test-Path Netch\bin)
-{
-    Remove-Item -Recurse -Force Netch\bin
-}
-
-if (Test-Path Netch\obj)
-{
-    Remove-Item -Recurse -Force Netch\obj
-}
-
-if (Test-Path NetchLib\bin)
-{
-    Remove-Item -Recurse -Force NetchLib\bin
-}
-
-if (Test-Path NetchLib\obj)
-{
-    Remove-Item -Recurse -Force NetchLib\obj
-}
-
-exit 0

Interop.nfapinet/Interop.nfapinet.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows7.0</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <Configurations>Debug;Release</Configurations>
+        <Platforms>x64</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <DebugType>none</DebugType>
+        <DebugSymbols>false</DebugSymbols>
+    </PropertyGroup>
+
+</Project>

Interop.nfapinet/nfapinet.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Runtime.InteropServices;
 
+// ReSharper disable All
+
 namespace nfapinet
 {
     public enum NF_STATUS

Netch.sln

@@ -5,10 +5,10 @@ VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netch", "Netch\Netch.csproj", "{4B041B91-5790-4571-8C58-C63FFE4BC9F8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SearchComboBox", "SearchComboBox\SearchComboBox.csproj", "{A8715AF4-ACC6-43F9-9381-4294C5360623}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "UnitTest\UnitTest.csproj", "{53397641-35CA-4336-8E22-2CE12EF476AC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.nfapinet", "Interop.nfapinet\Interop.nfapinet.csproj", "{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -19,13 +19,13 @@ Global
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Debug|x64.Build.0 = Debug|x64
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x64.ActiveCfg = Release|x64
 		{4B041B91-5790-4571-8C58-C63FFE4BC9F8}.Release|x64.Build.0 = Release|x64
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8715AF4-ACC6-43F9-9381-4294C5360623}.Release|x64.Build.0 = Release|Any CPU
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.ActiveCfg = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Debug|x64.Build.0 = Debug|x64
 		{53397641-35CA-4336-8E22-2CE12EF476AC}.Release|x64.ActiveCfg = Release|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.ActiveCfg = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Debug|x64.Build.0 = Debug|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.ActiveCfg = Release|x64
+		{2C968ADF-4822-46A9-A7D9-D05A61CB14DE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Netch/.gitignore

@@ -1,3 +0,0 @@
-/bin
-/obj
-/Netch.csproj.user

Netch/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <System.Windows.Forms.ApplicationConfigurationSection>
-    <add key="DpiAwareness" value="PerMonitorV2" />
-  </System.Windows.Forms.ApplicationConfigurationSection>
-</configuration>

Netch/Constants.cs

@@ -0,0 +1,14 @@
+namespace Netch
+{
+    public static class Constants
+    {
+        public const string EOF = "\r\n";
+
+        public static class Parameter
+        {
+            public const string Show = "-show";
+            public const string ForceUpdate = "-forceUpdate";
+            public const string Console = "-console";
+        }
+    }
+}

Netch/Controllers/DNSController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
+using static Netch.Interops.AioDNSInterops;
 
 namespace Netch.Controllers
 {
@@ -11,7 +10,7 @@ namespace Netch.Controllers
 
         public void Stop()
         {
-            aiodns_free();
+            Free();
         }
 
         /// <summary>
@@ -20,38 +19,14 @@ namespace Netch.Controllers
         /// <returns></returns>
         public void Start()
         {
-            aiodns_dial((int) NameList.TYPE_REST, null);
-            aiodns_dial((int) NameList.TYPE_ADDR, Encoding.UTF8.GetBytes($"{Global.Settings.LocalAddress}:53"));
-            aiodns_dial((int) NameList.TYPE_LIST, Encoding.UTF8.GetBytes(Path.GetFullPath(Global.Settings.AioDNS.RulePath)));
-            aiodns_dial((int) NameList.TYPE_CDNS, Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.ChinaDNS}:53"));
-            aiodns_dial((int) NameList.TYPE_ODNS, Encoding.UTF8.GetBytes($"{Global.Settings.AioDNS.OtherDNS}:53"));
-            aiodns_dial((int) NameList.TYPE_METH, Encoding.UTF8.GetBytes(Global.Settings.AioDNS.Protocol));
+            Dial(NameList.TYPE_REST, "");
+            Dial(NameList.TYPE_ADDR, $"{Global.Settings.LocalAddress}:{Global.Settings.AioDNS.ListenPort}");
+            Dial(NameList.TYPE_LIST, Path.GetFullPath(Global.Settings.AioDNS.RulePath));
+            Dial(NameList.TYPE_CDNS, $"{Global.Settings.AioDNS.ChinaDNS}");
+            Dial(NameList.TYPE_ODNS, $"{Global.Settings.AioDNS.OtherDNS}");
 
-            if (!aiodns_init())
+            if (!Init())
                 throw new Exception("AioDNS start failed");
         }
-
-        #region NativeMethods
-
-        [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aiodns_dial(int name, byte[]? value);
-
-        [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool aiodns_init();
-
-        [DllImport("aiodns.bin", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void aiodns_free();
-
-        private enum NameList
-        {
-            TYPE_REST,
-            TYPE_ADDR,
-            TYPE_LIST,
-            TYPE_CDNS,
-            TYPE_ODNS,
-            TYPE_METH
-        }
-
-        #endregion
     }
 }

Netch/Controllers/Guard.cs

@@ -30,12 +30,12 @@ namespace Netch.Controllers
         /// <summary>
         ///     成功启动关键词
         /// </summary>
-        protected virtual IEnumerable<string> StartedKeywords { get; } = new List<string>();
+        protected virtual IEnumerable<string> StartedKeywords { get; set; } = new List<string>();
 
         /// <summary>
         ///     启动失败关键词
         /// </summary>
-        protected virtual IEnumerable<string> StoppedKeywords { get; } = new List<string>();
+        protected virtual IEnumerable<string> StoppedKeywords { get; set; } = new List<string>();
 
         public abstract string Name { get; }
 

Netch/Controllers/HTTPController.cs

@@ -1,87 +0,0 @@
-using System.Threading.Tasks;
-using WindowsProxy;
-using Netch.Models;
-using Netch.Servers.Socks5;
-using Netch.Servers.Trojan;
-using Netch.Utils;
-using Netch.Utils.HttpProxyHandler;
-
-namespace Netch.Controllers
-{
-    public class HTTPController : IModeController
-    {
-        public readonly PrivoxyController PrivoxyController = new();
-
-        private ProxyStatus? _oldState;
-
-        public string Name { get; } = "HTTP";
-
-        /// <summary>
-        ///     启动
-        /// </summary>
-        /// <param name="mode">模式</param>
-        /// <returns>是否启动成功</returns>
-        public void Start(in Mode mode)
-        {
-            PrivoxyController.Start(MainController.Server!);
-            Global.Job.AddProcess(PrivoxyController.Instance!);
-            string? pacUrl = null;
-
-            if (MainController.Server is Socks5 or Trojan && mode.BypassChina || (Global.Settings.AlwaysStartPACServer ?? false))
-            {
-                try
-                {
-                    PortHelper.CheckPort(Global.Settings.Pac_Port);
-                }
-                catch
-                {
-                    Global.Settings.Pac_Port = PortHelper.GetAvailablePort();
-                }
-
-                pacUrl = PACServerHandle.InitPACServer("127.0.0.1");
-            }
-
-            if (mode.Type is 3)
-            {
-                using var service = new ProxyService();
-                _oldState = service.Query();
-
-                if (pacUrl != null)
-                {
-                    service.AutoConfigUrl = pacUrl;
-                    service.Pac();
-                }
-                else
-                {
-                    service.Server = $"127.0.0.1:{Global.Settings.HTTPLocalPort}";
-                    service.Bypass = string.Join(";", ProxyService.LanIp);
-
-                    service.Global();
-                }
-            }
-        }
-
-        /// <summary>
-        ///     停止
-        /// </summary>
-        public void Stop()
-        {
-            var tasks = new[]
-            {
-                Task.Run(PrivoxyController.Stop),
-                Task.Run(() =>
-                {
-                    PACServerHandle.Stop();
-
-                    if (_oldState != null)
-                    {
-                        using var service = new ProxyService();
-                        service.Set(_oldState!);
-                    }
-                })
-            };
-
-            Task.WaitAll(tasks);
-        }
-    }
-}

Netch/Controllers/MainController.cs

@@ -1,11 +1,9 @@
 using System;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Netch.Models;
 using Netch.Servers.Socks5;
 using Netch.Utils;
-using static Netch.Utils.PortHelper;
 
 namespace Netch.Controllers
 {
@@ -49,15 +47,17 @@ namespace Netch.Controllers
         /// <param name="mode">模式</param>
         /// <returns>是否启动成功</returns>
         /// <exception cref="MessageException"></exception>
-        public static async Task Start(Server server, Mode mode)
+        public static async Task StartAsync(Server server, Mode mode)
+        {
+            await Task.Run(() => Start(server, mode));
+        }
+
+        public static void Start(Server server, Mode mode)
         {
             Logging.Info($"启动主控制器: {server.Type} [{mode.Type}]{mode.Remark}");
             Server = server;
             Mode = mode;
 
-            if (server is Socks5 && mode.Type == 4)
-                throw new MessageException("Already Socks5 Server");
-
             // 刷新DNS缓存
             NativeMethods.FlushDNSResolverCache();
 
@@ -71,23 +71,15 @@ namespace Netch.Controllers
             {
                 if (!ModeHelper.SkipServerController(server, mode))
                 {
-                    await Task.Run(() => StartServer(server, mode, out _serverController));
-
+                    StartServer(server, mode, out _serverController);
                     StatusPortInfoText.UpdateShareLan();
                 }
 
-                await Task.Run(() => StartMode(mode));
+                StartMode(mode);
             }
             catch (Exception e)
             {
-                try
-                {
-                    await Stop();
-                }
-                catch
-                {
-                    // ignored
-                }
+                Stop();
 
                 switch (e)
                 {
@@ -108,20 +100,11 @@ namespace Netch.Controllers
         {
             controller = ServerHelper.GetUtilByTypeName(server.Type).GetController();
 
-            if (controller is Guard instanceController)
-                Utils.Utils.KillProcessByName(instanceController.MainFile);
-
-            PortCheck(controller.Socks5LocalPort(), "Socks5");
+            TryReleaseTcpPort(controller.Socks5LocalPort(), "Socks5");
 
             Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", controller.Name));
 
             controller.Start(in server, mode);
-            if (controller is Guard {Instance: { }} guard)
-                Task.Run(() =>
-                {
-                    Thread.Sleep(1000);
-                    Global.Job.AddProcess(guard.Instance!);
-                });
 
             if (server is Socks5 socks5)
             {
@@ -136,25 +119,25 @@ namespace Netch.Controllers
 
         private static void StartMode(Mode mode)
         {
-            ModeController = ModeHelper.GetModeControllerByType(mode.Type, out var port, out var portName, out var portType);
-
-            if (ModeController == null)
-                return;
+            ModeController = ModeHelper.GetModeControllerByType(mode.Type, out var port, out var portName);
 
             if (port != null)
-                PortCheck((ushort) port, portName, portType);
+                TryReleaseTcpPort((ushort) port, portName);
 
             Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", ModeController.Name));
 
             ModeController.Start(mode);
-            if (ModeController is Guard {Instance: { }} guard)
-                Global.Job.AddProcess(guard.Instance!);
+        }
+
+        public static async Task StopAsync()
+        {
+            await Task.Run(Stop);
         }
 
         /// <summary>
         ///     停止
         /// </summary>
-        public static async Task Stop()
+        public static void Stop()
         {
             if (_serverController == null && ModeController == null)
                 return;
@@ -169,7 +152,16 @@ namespace Netch.Controllers
                 Task.Run(() => ModeController?.Stop())
             };
 
-            await Task.WhenAll(tasks);
+            try
+            {
+                Task.WaitAll(tasks);
+            }
+            catch (Exception e)
+            {
+                Logging.Error(e.ToString());
+                Utils.Utils.Open(Logging.LogFile);
+            }
+
             ModeController = null;
             ServerController = null;
         }
@@ -178,7 +170,7 @@ namespace Netch.Controllers
         {
             try
             {
-                CheckPort(port, portType);
+                PortHelper.CheckPort(port, portType);
             }
             catch (PortInUseException)
             {
@@ -189,16 +181,34 @@ namespace Netch.Controllers
                 throw new MessageException(i18N.TranslateFormat("The {0} port is reserved by system.", $"{portName} ({port})"));
             }
         }
-    }
 
-    public class MessageException : Exception
-    {
-        public MessageException()
+        public static void TryReleaseTcpPort(ushort port, string portName)
         {
-        }
+            foreach (var p in PortHelper.GetProcessByUsedTcpPort(port))
+            {
+                string fileName;
+                try
+                {
+                    fileName = p.MainModule?.FileName ?? throw new Exception(); // TODO what's this exception?
+                }
+                catch (Exception e)
+                {
+                    Logging.Warning(e.ToString());
+                    continue;
+                }
 
-        public MessageException(string message) : base(message)
-        {
+                if (fileName.StartsWith(Global.NetchDir))
+                {
+                    p.Kill();
+                    p.WaitForExit();
+                }
+                else
+                {
+                    throw new MessageException(i18N.TranslateFormat("The {0} port is used by {1}.", $"{portName} ({port})", $"({p.Id}){fileName}"));
+                }
+            }
+
+            PortCheck(port, portName, PortType.TCP);
         }
     }
 }

Netch/Controllers/NFController.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.ServiceProcess;
-using System.Threading.Tasks;
 using Netch.Models;
 using Netch.Servers.Shadowsocks;
 using Netch.Servers.Socks5;
 using Netch.Utils;
 using nfapinet;
+using static Netch.Interops.RedirectorInterop;
 
 namespace Netch.Controllers
 {
@@ -17,161 +16,89 @@ namespace Netch.Controllers
     {
         private static readonly ServiceController NFService = new("netfilter2");
 
-        private static readonly string BinDriver;
+        private const string BinDriver = "bin\\nfdriver.sys";
         private static readonly string SystemDriver = $"{Environment.SystemDirectory}\\drivers\\netfilter2.sys";
 
-        private static string? _sysDns;
-        private OutboundAdapter? _outbound;
-
-        static NFController()
-        {
-            string fileName;
-            switch ($"{Environment.OSVersion.Version.Major}.{Environment.OSVersion.Version.Minor}")
-            {
-                case "10.0":
-                    fileName = "Win-10.sys";
-                    break;
-                case "6.3":
-                case "6.2":
-                    fileName = "Win-8.sys";
-                    break;
-                case "6.1":
-                case "6.0":
-                    fileName = "Win-7.sys";
-                    break;
-                default:
-                    throw new MessageException($"不支持的系统版本：{Environment.OSVersion.Version}");
-            }
-
-            BinDriver = "bin\\" + fileName;
-        }
-
         public string Name { get; } = "Redirector";
 
         public void Start(in Mode mode)
         {
             CheckDriver();
 
-            #region aio_dial
+            Dial(NameList.TYPE_FILTERLOOPBACK, "false");
+            Dial(NameList.TYPE_FILTERICMP, "true");
+            var p = PortHelper.GetAvailablePort();
+            Dial(NameList.TYPE_TCPLISN, p.ToString());
+            Dial(NameList.TYPE_UDPLISN, p.ToString());
 
-            aio_dial((int) NameList.TYPE_FILTERLOOPBACK, "false");
-            aio_dial((int) NameList.TYPE_TCPLISN, Global.Settings.RedirectorTCPPort.ToString());
+            // Server
+            Dial(NameList.TYPE_FILTERUDP, (Global.Settings.Redirector.ProxyProtocol != PortType.TCP).ToString().ToLower());
+            Dial(NameList.TYPE_FILTERTCP, (Global.Settings.Redirector.ProxyProtocol != PortType.UDP).ToString().ToLower());
+            dial_Server(Global.Settings.Redirector.ProxyProtocol);
 
-            aio_dial((int) NameList.TYPE_FILTERUDP, (Global.Settings.ProcessProxyProtocol != PortType.TCP).ToString().ToLower());
-            aio_dial((int) NameList.TYPE_FILTERTCP, (Global.Settings.ProcessProxyProtocol != PortType.UDP).ToString().ToLower());
-            SetServer(Global.Settings.ProcessProxyProtocol);
+            // Mode Rule
+            dial_Name(mode);
 
-            if (!CheckRule(mode.FullRule, out var list))
-                throw new MessageException($"\"{string.Join("", list.Select(s => s + "\n"))}\" does not conform to C++ regular expression syntax");
+            // Features
+            Dial(NameList.TYPE_DNSHOST, Global.Settings.Redirector.DNSHijack ? Global.Settings.Redirector.DNSHijackHost : "");
 
-            SetName(mode);
-
-            #endregion
-
-            if (Global.Settings.ModifySystemDNS)
-            {
-                _outbound = new OutboundAdapter();
-                // 备份并替换系统 DNS
-                _sysDns = _outbound.DNS;
-                if (string.IsNullOrWhiteSpace(Global.Settings.ModifiedDNS))
-                    Global.Settings.ModifiedDNS = "1.1.1.1,8.8.8.8";
-
-                _outbound.DNS = Global.Settings.ModifiedDNS;
-            }
-
-            if (!aio_init())
+            if (!Init())
                 throw new MessageException("Redirector Start failed, run Netch with \"-console\" argument");
         }
 
         public void Stop()
         {
-            Task.Run(() =>
-            {
-                if (Global.Settings.ModifySystemDNS)
-                    //恢复系统DNS
-                    _outbound!.DNS = _sysDns!;
-            });
-
-            aio_free();
+            Free();
         }
 
-        /// <summary>
-        /// </summary>
-        /// <param name="rules"></param>
-        /// <param name="incompatibleRule"></param>
-        /// <returns>No Problem true</returns>
-        public static bool CheckRule(IEnumerable<string> rules, out IEnumerable<string> incompatibleRule)
-        {
-            incompatibleRule = rules.Where(r => !CheckCppRegex(r, false));
-            aio_dial((int) NameList.TYPE_CLRNAME, "");
-            return !incompatibleRule.Any();
-        }
+        #region CheckRule
 
         /// <summary>
         /// </summary>
         /// <param name="r"></param>
         /// <param name="clear"></param>
         /// <returns>No Problem true</returns>
-        public static bool CheckCppRegex(string r, bool clear = true)
+        private static bool CheckCppRegex(string r, bool clear = true)
         {
             try
             {
                 if (r.StartsWith("!"))
-                    return aio_dial((int) NameList.TYPE_ADDNAME, r.Substring(1));
+                    return Dial(NameList.TYPE_ADDNAME, r.Substring(1));
 
-                return aio_dial((int) NameList.TYPE_ADDNAME, r);
+                return Dial(NameList.TYPE_ADDNAME, r);
             }
             finally
             {
                 if (clear)
-                    aio_dial((int) NameList.TYPE_CLRNAME, "");
+                    Dial(NameList.TYPE_CLRNAME, "");
             }
         }
 
-        private static void CheckDriver()
+        /// <summary>
+        /// </summary>
+        /// <param name="rules"></param>
+        /// <param name="results"></param>
+        /// <returns>No Problem true</returns>
+        public static bool CheckRules(IEnumerable<string> rules, out IEnumerable<string> results)
         {
-            var binFileVersion = Utils.Utils.GetFileVersion(BinDriver);
-            var systemFileVersion = Utils.Utils.GetFileVersion(SystemDriver);
-
-            Logging.Info("内置驱动版本: " + binFileVersion);
-            Logging.Info("系统驱动版本: " + systemFileVersion);
-
-            if (!File.Exists(SystemDriver))
-            {
-                InstallDriver();
-                return;
-            }
-
-            var reinstallFlag = false;
-            if (Version.TryParse(binFileVersion, out var binResult) && Version.TryParse(systemFileVersion, out var systemResult))
-            {
-                if (binResult.CompareTo(systemResult) > 0)
-                    // Bin greater than Installed
-                    reinstallFlag = true;
-                else if (systemResult.Major != binResult.Major)
-                    // Installed greater than Bin but Major Version Difference (has breaking changes), do downgrade
-                    reinstallFlag = true;
-            }
-            else
-            {
-                if (!systemFileVersion.Equals(binFileVersion))
-                    reinstallFlag = true;
-            }
-
-            if (!reinstallFlag)
-                return;
-
-            Logging.Info("更新驱动");
-            UninstallDriver();
-            InstallDriver();
+            results = rules.Where(r => !CheckCppRegex(r, false));
+            Dial(NameList.TYPE_CLRNAME, "");
+            return !results.Any();
         }
 
-        private void SetServer(in PortType portType)
+        public static string GenerateInvalidRulesMessage(IEnumerable<string> rules)
+        {
+            return $"{string.Join("\n", rules)}\nAbove rules does not conform to C++ regular expression syntax";
+        }
+
+        #endregion
+
+        private void dial_Server(in PortType portType)
         {
             if (portType == PortType.Both)
             {
-                SetServer(PortType.TCP);
-                SetServer(PortType.UDP);
+                dial_Server(PortType.TCP);
+                dial_Server(PortType.UDP);
                 return;
             }
 
@@ -194,96 +121,102 @@ namespace Netch.Controllers
 
             if (server is Socks5 socks5)
             {
-                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5");
-                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}");
-                aio_dial((int) NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty);
-                aio_dial((int) NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty);
-                aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty);
+                Dial(NameList.TYPE_TCPTYPE + offset, "Socks5");
+                Dial(NameList.TYPE_TCPHOST + offset, $"{socks5.AutoResolveHostname()}:{socks5.Port}");
+                Dial(NameList.TYPE_TCPUSER + offset, socks5.Username ?? string.Empty);
+                Dial(NameList.TYPE_TCPPASS + offset, socks5.Password ?? string.Empty);
+                Dial(NameList.TYPE_TCPMETH + offset, string.Empty);
             }
-            else if (server is Shadowsocks shadowsocks && !shadowsocks.HasPlugin() && Global.Settings.RedirectorSS)
+            else if (server is Shadowsocks shadowsocks && !shadowsocks.HasPlugin() && Global.Settings.Redirector.RedirectorSS)
             {
-                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Shadowsocks");
-                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"{shadowsocks.AutoResolveHostname()}:{shadowsocks.Port}");
-                aio_dial((int) NameList.TYPE_TCPMETH + offset, shadowsocks.EncryptMethod ?? string.Empty);
-                aio_dial((int) NameList.TYPE_TCPPASS + offset, shadowsocks.Password ?? string.Empty);
+                Dial(NameList.TYPE_TCPTYPE + offset, "Shadowsocks");
+                Dial(NameList.TYPE_TCPHOST + offset, $"{shadowsocks.AutoResolveHostname()}:{shadowsocks.Port}");
+                Dial(NameList.TYPE_TCPMETH + offset, shadowsocks.EncryptMethod);
+                Dial(NameList.TYPE_TCPPASS + offset, shadowsocks.Password);
             }
             else
             {
-                aio_dial((int) NameList.TYPE_TCPTYPE + offset, "Socks5");
-                aio_dial((int) NameList.TYPE_TCPHOST + offset, $"127.0.0.1:{controller.Socks5LocalPort()}");
-                aio_dial((int) NameList.TYPE_TCPUSER + offset, string.Empty);
-                aio_dial((int) NameList.TYPE_TCPPASS + offset, string.Empty);
-                aio_dial((int) NameList.TYPE_TCPMETH + offset, string.Empty);
+                Dial(NameList.TYPE_TCPTYPE + offset, "Socks5");
+                Dial(NameList.TYPE_TCPHOST + offset, $"127.0.0.1:{controller.Socks5LocalPort()}");
+                Dial(NameList.TYPE_TCPUSER + offset, string.Empty);
+                Dial(NameList.TYPE_TCPPASS + offset, string.Empty);
+                Dial(NameList.TYPE_TCPMETH + offset, string.Empty);
             }
         }
 
-        private void SetName(Mode mode)
+        private void dial_Name(Mode mode)
         {
-            aio_dial((int) NameList.TYPE_CLRNAME, "");
-            foreach (var rule in mode.FullRule)
+            Dial(NameList.TYPE_CLRNAME, "");
+            var invalidList = new List<string>();
+            foreach (var s in mode.FullRule)
             {
-                if (rule.StartsWith("!"))
+                if (s.StartsWith("!"))
                 {
-                    aio_dial((int) NameList.TYPE_BYPNAME, rule.Substring(1));
+                    if (!Dial(NameList.TYPE_BYPNAME, s.Substring(1)))
+                        invalidList.Add(s);
+
                     continue;
                 }
 
-                aio_dial((int) NameList.TYPE_ADDNAME, rule);
+                if (!Dial(NameList.TYPE_ADDNAME, s))
+                    invalidList.Add(s);
             }
 
-            aio_dial((int) NameList.TYPE_ADDNAME, @"NTT\.exe");
-            aio_dial((int) NameList.TYPE_BYPNAME, "^" + Global.NetchDir.ToRegexString() + @"((?!NTT\.exe).)*$");
+            if (invalidList.Any())
+                throw new MessageException(GenerateInvalidRulesMessage(invalidList));
+
+            Dial(NameList.TYPE_ADDNAME, @"NTT\.exe");
+            Dial(NameList.TYPE_BYPNAME, "^" + Global.NetchDir.ToRegexString() + @"((?!NTT\.exe).)*$");
         }
 
-        #region NativeMethods
+        #region DriverUtil
 
-        private const int UdpNameListOffset = (int) NameList.TYPE_UDPTYPE - (int) NameList.TYPE_TCPTYPE;
-
-        [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        private static extern bool aio_dial(int name, [MarshalAs(UnmanagedType.LPWStr)] string value);
-
-        [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        private static extern bool aio_init();
-
-        [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        private static extern bool aio_free();
-
-        [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        private static extern ulong aio_getUP();
-
-        [DllImport("Redirector.bin", CallingConvention = CallingConvention.Cdecl)]
-        private static extern ulong aio_getDL();
-
-        public enum NameList
+        private static void CheckDriver()
         {
-            TYPE_FILTERLOOPBACK,
-            TYPE_FILTERTCP,
-            TYPE_FILTERUDP,
-            TYPE_TCPLISN,
-            TYPE_TCPTYPE,
-            TYPE_TCPHOST,
-            TYPE_TCPUSER,
-            TYPE_TCPPASS,
-            TYPE_TCPMETH,
-            TYPE_UDPTYPE,
-            TYPE_UDPHOST,
-            TYPE_UDPUSER,
-            TYPE_UDPPASS,
-            TYPE_UDPMETH,
-            TYPE_ADDNAME,
-            TYPE_BYPNAME,
-            TYPE_CLRNAME
+            var binFileVersion = Utils.Utils.GetFileVersion(BinDriver);
+            var systemFileVersion = Utils.Utils.GetFileVersion(SystemDriver);
+
+            Logging.Info("内置驱动版本: " + binFileVersion);
+            Logging.Info("系统驱动版本: " + systemFileVersion);
+
+            if (!File.Exists(SystemDriver))
+            {
+                // Install
+                InstallDriver();
+                return;
+            }
+
+            var reinstall = false;
+            if (Version.TryParse(binFileVersion, out var binResult) && Version.TryParse(systemFileVersion, out var systemResult))
+            {
+                if (binResult.CompareTo(systemResult) > 0)
+                    // Update
+                    reinstall = true;
+                else if (systemResult.Major != binResult.Major)
+                    // Downgrade when Major version different (may have breaking changes)
+                    reinstall = true;
+            }
+            else
+            {
+                // Parse File versionName to Version failed
+                if (!systemFileVersion.Equals(binFileVersion))
+                    // versionNames are different, Reinstall
+                    reinstall = true;
+            }
+
+            if (!reinstall)
+                return;
+
+            Logging.Info("更新驱动");
+            UninstallDriver();
+            InstallDriver();
         }
 
-        #endregion
-
-        #region Utils
-
         /// <summary>
         ///     安装 NF 驱动
         /// </summary>
         /// <returns>驱动是否安装成功</returns>
-        public static void InstallDriver()
+        private static void InstallDriver()
         {
             Logging.Info("安装 NF 驱动");
 

Netch/Controllers/PcapController.cs

@@ -17,7 +17,7 @@ namespace Netch.Controllers
 
         public override string MainFile { get; protected set; } = "pcap2socks.exe";
 
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"└"};
+        protected override IEnumerable<string> StartedKeywords { get; set; } = new[] {"└"};
 
         private readonly OutboundAdapter _outbound = new();
 
@@ -47,7 +47,7 @@ namespace Netch.Controllers
             Global.MainForm.BeginInvoke(new Action(() =>
             {
                 if (!_form!.IsDisposed)
-                    _form!.richTextBox1.AppendText(line + "\n");
+                    _form.richTextBox1.AppendText(line + "\n");
             }));
         }
 

Netch/Controllers/PrivoxyController.cs

@@ -1,45 +0,0 @@
-using System.IO;
-using System.Text;
-using Netch.Models;
-using Netch.Servers.Socks5;
-
-namespace Netch.Controllers
-{
-    public class PrivoxyController : Guard, IController
-    {
-        public PrivoxyController()
-        {
-            RedirectStd = false;
-        }
-
-        public override string MainFile { get; protected set; } = "Privoxy.exe";
-
-        public override string Name { get; } = "Privoxy";
-
-        public override void Stop()
-        {
-            StopInstance();
-        }
-
-        public void Start(Server server)
-        {
-            var text = new StringBuilder(File.ReadAllText("bin\\default.conf"));
-
-            text.Replace("_BIND_PORT_", Global.Settings.HTTPLocalPort.ToString());
-            text.Replace("0.0.0.0", Global.Settings.LocalAddress); /* BIND_HOST */
-
-            if (server is Socks5 socks5 && !socks5.Auth())
-            {
-                text.Replace("/ 127.0.0.1", $"/ {server.AutoResolveHostname()}"); /* DEST_HOST */
-                text.Replace("_DEST_PORT_", socks5.Port.ToString());
-            }
-
-            text.Replace("_DEST_PORT_", Global.Settings.Socks5LocalPort.ToString());
-
-
-            File.WriteAllText("data\\privoxy.conf", text.ToString());
-
-            StartInstanceAuto("..\\data\\privoxy.conf");
-        }
-    }
-}

Netch/Controllers/TUNController.cs

@@ -0,0 +1,310 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using Netch.Models;
+using Netch.Servers.Socks5;
+using Netch.Utils;
+using static Netch.Interops.TUNInterop;
+
+namespace Netch.Controllers
+{
+    public class TUNController : IModeController
+    {
+        private readonly List<string> _directIPs = new();
+
+        private readonly List<string> _proxyIPs = new();
+
+        public readonly DNSController DNSController = new();
+
+        public string Name { get; } = "tun2socks";
+
+        private readonly OutboundAdapter _outboundAdapter = new();
+        private IAdapter _tunAdapter = null!;
+        private IPAddress _serverAddresses = null!;
+
+        public void Start(in Mode mode)
+        {
+            var server = MainController.Server!;
+            _serverAddresses = DnsUtils.Lookup(server.Hostname)!; // server address have been cached when MainController.Start
+
+            CheckDriver();
+
+            Dial(NameList.TYPE_ADAPMTU, "1500");
+            Dial(NameList.TYPE_BYPBIND, _outboundAdapter.Address.ToString());
+            Dial(NameList.TYPE_BYPLIST, "disabled");
+
+            #region Server
+
+            Dial(NameList.TYPE_TCPREST, "");
+            Dial(NameList.TYPE_TCPTYPE, "Socks5");
+
+            Dial(NameList.TYPE_UDPREST, "");
+            Dial(NameList.TYPE_UDPTYPE, "Socks5");
+
+            if (server is Socks5 socks5)
+            {
+                Dial(NameList.TYPE_TCPHOST, $"{server.AutoResolveHostname()}:{server.Port}");
+
+                Dial(NameList.TYPE_UDPHOST, $"{server.AutoResolveHostname()}:{server.Port}");
+
+                if (socks5.Auth())
+                {
+                    Dial(NameList.TYPE_TCPUSER, socks5.Username!);
+                    Dial(NameList.TYPE_TCPPASS, socks5.Password!);
+
+                    Dial(NameList.TYPE_UDPUSER, socks5.Username!);
+                    Dial(NameList.TYPE_UDPPASS, socks5.Password!);
+                }
+            }
+            else
+            {
+                Dial(NameList.TYPE_TCPHOST, $"127.0.0.1:{Global.Settings.Socks5LocalPort}");
+
+                Dial(NameList.TYPE_UDPHOST, $"127.0.0.1:{Global.Settings.Socks5LocalPort}");
+            }
+
+            #endregion
+
+            #region DNS
+
+            if (Global.Settings.TUNTAP.UseCustomDNS)
+            {
+                Dial(NameList.TYPE_DNSADDR, Global.Settings.TUNTAP.HijackDNS);
+            }
+            else
+            {
+                MainController.PortCheck(Global.Settings.AioDNS.ListenPort, "DNS");
+                DNSController.Start();
+                Dial(NameList.TYPE_DNSADDR, $"127.0.0.1:{Global.Settings.AioDNS.ListenPort}");
+            }
+
+            #endregion
+
+            Logging.Debug("tun2socks init");
+            Init();
+
+            _tunAdapter = new TunAdapter();
+
+            NativeMethods.CreateUnicastIP((int) AddressFamily.InterNetwork,
+                Global.Settings.TUNTAP.Address,
+                Utils.Utils.SubnetToCidr(Global.Settings.TUNTAP.Netmask),
+                _tunAdapter.InterfaceIndex);
+
+            SetupRouteTable(mode);
+        }
+
+        private readonly string BinDriver = Path.Combine(Global.NetchDir, @"bin\wintun.dll");
+        private readonly string SysDriver = $@"{Environment.SystemDirectory}\wintun.dll";
+
+        private void CheckDriver()
+        {
+            var binHash = Utils.Utils.SHA256CheckSum(BinDriver);
+            var sysHash = Utils.Utils.SHA256CheckSum(SysDriver);
+            Logging.Info("自带 wintun.dll Hash: " + binHash);
+            Logging.Info("系统 wintun.dll Hash: " + sysHash);
+            if (binHash == sysHash)
+                return;
+
+            try
+            {
+                File.Copy(BinDriver, SysDriver, true);
+            }
+            catch (Exception e)
+            {
+                Logging.Error(e.ToString());
+                throw new MessageException($"Failed to copy wintun.dll to system directory: {e.Message}");
+            }
+        }
+
+        /// <summary>
+        ///     TUN/TAP停止
+        /// </summary>
+        public void Stop()
+        {
+            var tasks = new[]
+            {
+                Task.Run(Free),
+                Task.Run(ClearRouteTable),
+                Task.Run(DNSController.Stop)
+            };
+
+            Task.WaitAll(tasks);
+        }
+
+        /// <summary>
+        ///     设置绕行规则
+        /// </summary>
+        /// <returns>是否设置成功</returns>
+        private void SetupRouteTable(Mode mode)
+        {
+            Global.MainForm.StatusText(i18N.Translate("SetupBypass"));
+            Logging.Info("设置路由规则");
+
+            Logging.Info("绕行 → 服务器 IP");
+            if (!IPAddress.IsLoopback(_serverAddresses))
+                RouteAction(Action.Create, $"{_serverAddresses}/32", RouteType.Outbound);
+
+            Logging.Info("绕行 → 全局绕过 IP");
+            RouteAction(Action.Create, Global.Settings.TUNTAP.BypassIPs, RouteType.Outbound);
+
+            #region Rule IPs
+
+            switch (mode.Type)
+            {
+                case 1:
+                    // 代理规则 IP
+                    Logging.Info("代理 → 规则 IP");
+                    RouteAction(Action.Create, mode.FullRule, RouteType.TUNTAP);
+
+                    if (Global.Settings.TUNTAP.ProxyDNS)
+                    {
+                        Logging.Info("代理 → 自定义 DNS");
+                        if (Global.Settings.TUNTAP.UseCustomDNS)
+                            RouteAction(Action.Create, Global.Settings.TUNTAP.HijackDNS.Select(ip => $"{ip}/32"), RouteType.TUNTAP);
+                        else
+                            RouteAction(Action.Create, $"{Global.Settings.AioDNS.OtherDNS}/32", RouteType.TUNTAP);
+                    }
+
+                    break;
+                case 2:
+                    // 绕过规则 IP
+
+                    Logging.Info("绕行 → 规则 IP");
+                    RouteAction(Action.Create, mode.FullRule, RouteType.Outbound);
+                    break;
+            }
+
+            #endregion
+
+            if (mode.Type == 2)
+            {
+                Logging.Info("代理 → 全局");
+                SetInterface(RouteType.TUNTAP, 0);
+                RouteAction(Action.Create, "0.0.0.0/0", RouteType.TUNTAP, record: false);
+            }
+        }
+
+        private void SetInterface(RouteType routeType, int? metric = null)
+        {
+            var adapter = routeType == RouteType.Outbound ? _outboundAdapter : _tunAdapter;
+
+            var arguments = $"interface ip set interface {adapter.InterfaceIndex} ";
+            if (metric != null)
+                arguments += $"metric={metric} ";
+
+            Utils.Utils.ProcessRunHiddenAsync("netsh", arguments).Wait();
+        }
+
+        /// <summary>
+        ///     清除绕行规则
+        /// </summary>
+        private bool ClearRouteTable()
+        {
+            var mode = MainController.Mode!;
+            RouteAction(Action.Delete, _directIPs, RouteType.Outbound);
+            RouteAction(Action.Delete, _proxyIPs, RouteType.TUNTAP);
+            _directIPs.Clear();
+            _proxyIPs.Clear();
+            if (mode.Type == 2)
+            {
+                SetInterface(RouteType.Outbound);
+            }
+
+            return true;
+        }
+
+        #region Package
+
+        private void RouteAction(Action action, in IEnumerable<string> ipNetworks, RouteType routeType, int metric = 0, bool record = true)
+        {
+            foreach (var address in ipNetworks)
+                RouteAction(action, address, routeType, metric);
+        }
+
+        private bool RouteAction(Action action, in string ipNetwork, RouteType routeType, int metric = 0, bool record = true)
+        {
+            #region
+
+            if (!TryParseIPNetwork(ipNetwork, out var ip, out var cidr))
+                return false;
+
+            IAdapter adapter = routeType switch
+                               {
+                                   RouteType.Outbound => _outboundAdapter,
+                                   RouteType.TUNTAP => _tunAdapter,
+                                   _ => throw new ArgumentOutOfRangeException(nameof(routeType), routeType, null)
+                               };
+
+            List<string> ipList = routeType switch
+                                  {
+                                      RouteType.Outbound => _directIPs,
+                                      RouteType.TUNTAP => _proxyIPs,
+                                      _ => throw new ArgumentOutOfRangeException(nameof(routeType), routeType, null)
+                                  };
+
+            string gateway = adapter.Gateway.ToString();
+            var index = adapter.InterfaceIndex;
+
+            #endregion
+
+            bool result;
+            switch (action)
+            {
+                case Action.Create:
+                    result = NativeMethods.CreateRoute((int) AddressFamily.InterNetwork, ip, cidr, gateway, index, metric);
+                    if (result && record)
+                        ipList.Add(ipNetwork);
+
+                    break;
+                case Action.Delete:
+                    result = NativeMethods.DeleteRoute((int) AddressFamily.InterNetwork, ip, cidr, gateway, index, metric);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(action), action, null);
+            }
+
+            Logging.Debug($"{action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
+            if (!result)
+            {
+                Logging.Warning($"Failed to invoke {action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
+            }
+
+            return result;
+        }
+
+        bool TryParseIPNetwork(string ipNetwork, out string ip, out int cidr)
+        {
+            ip = null!;
+            cidr = 0;
+
+            var s = ipNetwork.Split('/');
+            if (s.Length != 2)
+            {
+                Logging.Warning($"Failed to parse rule {ipNetwork}");
+                return false;
+            }
+
+            ip = s[0];
+            cidr = int.Parse(s[1]);
+            return true;
+        }
+
+        private enum RouteType
+        {
+            Outbound,
+            TUNTAP
+        }
+
+        private enum Action
+        {
+            Create,
+            Delete
+        }
+
+        #endregion
+    }
+}

Netch/Controllers/TUNTAPController.cs

@@ -1,255 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Netch.Models;
-using Netch.Servers.Socks5;
-using Netch.Utils;
-
-namespace Netch.Controllers
-{
-    public class TUNTAPController : Guard, IModeController
-    {
-        private readonly List<string> _directIPs = new();
-
-        private readonly List<string> _proxyIPs = new();
-        /// <summary>
-        ///     服务器 IP 地址
-        /// </summary>
-        private IPAddress _serverAddresses = null!;
-
-        /// <summary>
-        ///     本地 DNS 服务控制器
-        /// </summary>
-        public DNSController DNSController = new();
-
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"Running"};
-
-        protected override IEnumerable<string> StoppedKeywords { get; } = new[] {"failed", "invalid vconfig file"};
-
-        public override string MainFile { get; protected set; } = "tun2socks.exe";
-
-        protected override Encoding InstanceOutputEncoding { get; } = Encoding.UTF8;
-
-        public override string Name { get; } = "tun2socks";
-
-        private readonly OutboundAdapter _outbound = new();
-        private TapAdapter _tap = null!;
-
-        public void Start(in Mode mode)
-        {
-            var server = MainController.Server!;
-            _serverAddresses = DnsUtils.Lookup(server.Hostname)!; // server address have been cached when MainController.Start
-
-            if (TUNTAP.GetComponentID() == null)
-                TUNTAP.AddTap();
-
-            _tap = new TapAdapter();
-
-            List<string> dns;
-            if (Global.Settings.TUNTAP.UseCustomDNS)
-            {
-                dns = Global.Settings.TUNTAP.DNS.Any() ? Global.Settings.TUNTAP.DNS : Global.Settings.TUNTAP.DNS = new List<string> {"1.1.1.1"};
-            }
-            else
-            {
-                MainController.PortCheck(53, "DNS");
-                DNSController.Start();
-                dns = new List<string> {"127.0.0.1"};
-            }
-
-            SetupRouteTable(mode);
-
-            Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", Name));
-
-            var argument = new StringBuilder();
-            if (server is Socks5 socks5 && !socks5.Auth())
-                argument.Append($"-proxyServer {server.AutoResolveHostname()}:{server.Port} ");
-            else
-                argument.Append($"-proxyServer 127.0.0.1:{Global.Settings.Socks5LocalPort} ");
-
-            argument.Append(
-                $"-tunAddr {Global.Settings.TUNTAP.Address} -tunMask {Global.Settings.TUNTAP.Netmask} -tunGw {Global.Settings.TUNTAP.Gateway} -tunDns {DnsUtils.Join(dns)} -tunName \"{TUNTAP.GetName(_tap.ComponentID)}\" ");
-
-            if (Global.Settings.TUNTAP.UseFakeDNS && Global.Flags.SupportFakeDns)
-                argument.Append("-fakeDns ");
-
-            StartInstanceAuto(argument.ToString(), ProcessPriorityClass.RealTime);
-        }
-
-        /// <summary>
-        ///     TUN/TAP停止
-        /// </summary>
-        public override void Stop()
-        {
-            var tasks = new[]
-            {
-                Task.Run(StopInstance),
-                Task.Run(ClearRouteTable),
-                Task.Run(DNSController.Stop)
-            };
-
-            Task.WaitAll(tasks);
-        }
-
-        /// <summary>
-        ///     设置绕行规则
-        /// </summary>
-        /// <returns>是否设置成功</returns>
-        private void SetupRouteTable(Mode mode)
-        {
-            Global.MainForm.StatusText(i18N.Translate("SetupBypass"));
-            Logging.Info("设置路由规则");
-
-            #region Rule IPs
-
-            switch (mode.Type)
-            {
-                case 1:
-                    // 代理规则 IP
-                    Logging.Info("代理 → 规则 IP");
-                    RouteAction(Action.Create, mode.FullRule, RouteType.TUNTAP);
-
-                    if (Global.Settings.TUNTAP.ProxyDNS)
-                    {
-                        Logging.Info("代理 → 自定义 DNS");
-                        if (Global.Settings.TUNTAP.UseCustomDNS)
-                            RouteAction(Action.Create, Global.Settings.TUNTAP.DNS.Select(ip => $"{ip}/32"), RouteType.TUNTAP);
-                        else
-                            RouteAction(Action.Create, $"{Global.Settings.AioDNS.OtherDNS}/32", RouteType.TUNTAP);
-                    }
-
-                    break;
-                case 2:
-                    // 绕过规则 IP
-
-                    // 将 TUN/TAP 网卡权重放到最高
-                    Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "netsh",
-                        Arguments = $"interface ip set interface {_tap.Index} metric=0",
-                        WindowStyle = ProcessWindowStyle.Hidden,
-                        UseShellExecute = true,
-                        CreateNoWindow = true
-                    });
-
-                    Logging.Info("绕行 → 规则 IP");
-                    RouteAction(Action.Create, mode.FullRule, RouteType.Outbound);
-                    break;
-            }
-
-            #endregion
-
-            Logging.Info("绕行 → 服务器 IP");
-            if (!IPAddress.IsLoopback(_serverAddresses))
-                RouteAction(Action.Create, $"{_serverAddresses}/32", RouteType.Outbound);
-
-            Logging.Info("绕行 → 全局绕过 IP");
-            RouteAction(Action.Create, Global.Settings.BypassIPs, RouteType.Outbound);
-
-            if (mode.Type == 2)
-            {
-                Logging.Info("代理 → 全局");
-                RouteAction(Action.Create, "0.0.0.0/0", RouteType.TUNTAP);
-            }
-        }
-
-        /// <summary>
-        ///     清除绕行规则
-        /// </summary>
-        private bool ClearRouteTable()
-        {
-            RouteAction(Action.Delete, _directIPs, RouteType.Outbound);
-            RouteAction(Action.Delete, _proxyIPs, RouteType.TUNTAP);
-            _directIPs.Clear();
-            _proxyIPs.Clear();
-            return true;
-        }
-
-        public bool TestFakeDNS()
-        {
-            try
-            {
-                InitInstance("-h");
-                Instance!.Start();
-                return Instance.StandardError.ReadToEnd().Contains("-fakeDns");
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private void RouteAction(Action action, in IEnumerable<string> ipNetworks, RouteType routeType, int metric = 0)
-        {
-            foreach (var address in ipNetworks)
-                RouteAction(action, address, routeType, metric);
-        }
-
-        private bool RouteAction(Action action, in string ipNetwork, RouteType routeType, int metric = 0)
-        {
-            var s = ipNetwork.Split('/');
-            if (s.Length != 2)
-            {
-                Logging.Warning($"Failed to parse rule {ipNetwork}");
-                return false;
-            }
-
-            IAdapter adapter;
-            List<string> ipList;
-
-            switch (routeType)
-            {
-                case RouteType.TUNTAP:
-                    adapter = _tap;
-                    ipList = _proxyIPs;
-                    break;
-                case RouteType.Outbound:
-                    adapter = _outbound;
-                    ipList = _directIPs;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(routeType), routeType, null);
-            }
-
-            string network = s[0];
-            var cidr = ushort.Parse(s[1]);
-            string gateway = adapter.Gateway.ToString();
-            var index = adapter.Index;
-
-            bool result;
-            switch (action)
-            {
-                case Action.Create:
-                    result = NativeMethods.CreateRoute(network, cidr, gateway, index, metric);
-                    ipList.Add(ipNetwork);
-                    break;
-                case Action.Delete:
-                    result = NativeMethods.DeleteRoute(network, cidr, gateway, index, metric);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(action), action, null);
-            }
-
-            if (!result)
-                Logging.Warning($"Failed to {action} Route on {routeType} Adapter: {ipNetwork} metric {metric}");
-
-            return result;
-        }
-
-        private enum RouteType
-        {
-            Outbound,
-            TUNTAP
-        }
-
-        private enum Action
-        {
-            Create,
-            Delete
-        }
-    }
-}

Netch/Controllers/UpdateChecker.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -18,8 +19,8 @@ namespace Netch.Controllers
         public const string Name = @"Netch";
         public const string Copyright = @"Copyright © 2019 - 2021";
 
-        public const string AssemblyVersion = @"1.8.1";
-        private const string Suffix = @"";
+        public const string AssemblyVersion = @"1.8.3";
+        private const string Suffix = @"Beta6";
 
         public static readonly string Version = $"{AssemblyVersion}{(string.IsNullOrEmpty(Suffix) ? "" : $"-{Suffix}")}";
 
@@ -69,31 +70,39 @@ namespace Netch.Controllers
             }
         }
 
-        public static bool GetFileNameAndHashFromMarkdownForm(in string text, out string fileName, out string sha256, string? keyword = null)
+        public static void GetLatestUpdateFileNameAndHash(out string fileName, out string sha256, string? keyword = null)
         {
-            IEnumerable<Match> matches;
-            try
-            {
-                matches = Regex.Matches(text, @"^\| (?<filename>.*) \| (?<sha256>.*) \|\r?$", RegexOptions.Multiline).Cast<Match>().Skip(2);
-            }
-            catch (Exception e)
-            {
-                Logging.Error(e.ToString());
-                throw new Exception(i18N.Translate("Find update filename and hash failed"));
-            }
+            fileName = string.Empty;
+            sha256 = string.Empty;
+
+            var matches = Regex.Matches(LatestRelease.body, @"^\| (?<filename>.*) \| (?<sha256>.*) \|\r?$", RegexOptions.Multiline)
+                .Cast<Match>()
+                .Skip(2);
+            /*
+              Skip(2)
+              
+              | 文件名 | SHA256 |
+              | :- | :- |
+           */
 
             Match match = keyword == null ? matches.First() : matches.First(m => m.Groups["filename"].Value.Contains(keyword));
 
-            if (match != null)
+            fileName = match.Groups["filename"].Value;
+            sha256 = match.Groups["sha256"].Value;
+        }
+
+        public static string GetLatestReleaseContent()
+        {
+            var sb = new StringBuilder();
+            foreach (string l in LatestRelease.body.GetLines(false).SkipWhile(l => l.FirstOrDefault() != '#'))
             {
-                fileName = match.Groups["filename"].Value;
-                sha256 = match.Groups["sha256"].Value;
-                return true;
+                if (l.Contains("校验和"))
+                    break;
+
+                sb.AppendLine(l);
             }
 
-            fileName = string.Empty;
-            sha256 = string.Empty;
-            return false;
+            return sb.ToString();
         }
     }
-}
+}

Netch/Flags.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Netch
+{
+    public static class Flags
+    {
+        public static readonly bool IsWindows10Upper = Environment.OSVersion.Version.Major >= 10;
+
+        public static bool AlwaysShowNewVersionFound { get; set; }
+    }
+}

Netch/Forms/GlobalBypassIPForm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Net;
 using System.Windows.Forms;
 using Netch.Properties;
@@ -18,7 +19,7 @@ namespace Netch.Forms
         {
             i18N.TranslateForm(this);
 
-            IPListBox.Items.AddRange(Global.Settings.BypassIPs.ToArray());
+            IPListBox.Items.AddRange(Global.Settings.TUNTAP.BypassIPs.Cast<object>().ToArray());
 
             for (var i = 32; i >= 1; i--)
                 PrefixComboBox.Items.Add(i);
@@ -31,7 +32,7 @@ namespace Netch.Forms
             if (!string.IsNullOrEmpty(IPTextBox.Text))
             {
                 if (IPAddress.TryParse(IPTextBox.Text, out var address))
-                    IPListBox.Items.Add(string.Format("{0}/{1}", address, PrefixComboBox.SelectedItem));
+                    IPListBox.Items.Add($"{address}/{PrefixComboBox.SelectedItem}");
                 else
                     MessageBoxX.Show(i18N.Translate("Please enter a correct IP address"));
             }
@@ -51,9 +52,9 @@ namespace Netch.Forms
 
         private void ControlButton_Click(object sender, EventArgs e)
         {
-            Global.Settings.BypassIPs.Clear();
+            Global.Settings.TUNTAP.BypassIPs.Clear();
             foreach (var ip in IPListBox.Items)
-                Global.Settings.BypassIPs.Add((string) ip);
+                Global.Settings.TUNTAP.BypassIPs.Add((string) ip);
 
             Configuration.Save();
             MessageBoxX.Show(i18N.Translate("Saved"));

Netch/Forms/LogForm.Designer.cs

@@ -40,7 +40,7 @@ namespace Netch.Forms
             this.richTextBox1.BackColor = System.Drawing.SystemColors.Control;
             this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.richTextBox1.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.richTextBox1.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.richTextBox1.Location = new System.Drawing.Point(0, 0);
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.ReadOnly = true;
@@ -54,14 +54,14 @@ namespace Netch.Forms
             this.checkBox1.AutoSize = true;
             this.checkBox1.Location = new System.Drawing.Point(12, 297);
             this.checkBox1.Name = "checkBox1";
-            this.checkBox1.Size = new System.Drawing.Size(102, 16);
+            this.checkBox1.Size = new System.Drawing.Size(101, 21);
             this.checkBox1.TabIndex = 1;
             this.checkBox1.Text = "Scroll to End";
             this.checkBox1.UseVisualStyleBackColor = true;
             // 
             // LogForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(454, 318);
             this.ControlBox = false;

Netch/Forms/LogForm.cs

@@ -16,13 +16,13 @@ namespace Netch.Forms
             _parent = parent;
         }
 
-        protected override void OnLoad(EventArgs e)
+        protected override void OnLoad(EventArgs? e)
         {
             base.OnLoad(e);
             Parent_Move(null!, null!);
         }
 
-        private void Parent_Move(object sender, EventArgs e)
+        private void Parent_Move(object? sender, EventArgs? e)
         {
             var cl = Location;
             var fl = _parent.Location;
@@ -32,7 +32,7 @@ namespace Netch.Forms
             Location = cl;
         }
 
-        private void Parent_Activated(object sender, EventArgs e)
+        private void Parent_Activated(object? sender, EventArgs? e)
         {
             SetWindowPos(Handle,
                 HWND.HWND_TOPMOST,
@@ -51,7 +51,7 @@ namespace Netch.Forms
                 SetWindowPosFlags.SWP_NOACTIVATE | SetWindowPosFlags.SWP_NOMOVE | SetWindowPosFlags.SWP_NOSIZE | SetWindowPosFlags.SWP_SHOWWINDOW);
         }
 
-        private void richTextBox1_TextChanged(object sender, System.EventArgs e)
+        private void richTextBox1_TextChanged(object? sender, EventArgs? e)
         {
             if (!checkBox1.Checked)
                 return;
@@ -60,19 +60,19 @@ namespace Netch.Forms
             richTextBox1.ScrollToCaret();
         }
 
-        private void Notifycation_Load(object sender, EventArgs e)
+        private void Notifycation_Load(object? sender, EventArgs? e)
         {
             _parent.LocationChanged += Parent_Move;
             _parent.SizeChanged += Parent_Move;
             _parent.Activated += Parent_Activated;
         }
 
-        protected override void OnClosing(CancelEventArgs e)
+        protected override void OnClosing(CancelEventArgs? e)
         {
             _parent.Activated -= Parent_Activated;
             _parent.LocationChanged -= Parent_Move;
             _parent.SizeChanged -= Parent_Move;
-            base.OnClosing(e);
+            base.OnClosing(e!);
         }
     }
 }

Netch/Forms/LogForm.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Netch/Forms/MainForm.Designer.cs

@@ -29,26 +29,19 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.MenuStrip = new System.Windows.Forms.MenuStrip();
             this.ServerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ImportServersFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CreateProcessModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CreateRouteTableRuleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.ReloadModesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SubscribeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ManageSubscribeLinksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.UpdateServersFromSubscribeLinksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.OptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.OpenDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CleanDNSCacheToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.UpdateACLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.updateACLWithProxyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.updatePACToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.UninstallServiceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.UninstallTapDriverToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.removeNetchFirewallRulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.CheckForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -63,7 +56,7 @@
             this.ModeLabel = new System.Windows.Forms.Label();
             this.ServerLabel = new System.Windows.Forms.Label();
             this.ProfileNameText = new System.Windows.Forms.TextBox();
-            this.ModeComboBox = new System.Windows.Forms.SearchComboBox();
+            this.ModeComboBox = new System.Windows.Forms.ComboBox();
             this.ServerComboBox = new System.Windows.Forms.ComboBox();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.EditServerPictureBox = new System.Windows.Forms.PictureBox();
@@ -95,13 +88,13 @@
             this.ConfigurationGroupBox.SuspendLayout();
             this.configLayoutPanel.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize) (this.EditServerPictureBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize) (this.CopyLinkPictureBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize) (this.DeleteServerPictureBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize) (this.SpeedPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.EditServerPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CopyLinkPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DeleteServerPictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.SpeedPictureBox)).BeginInit();
             this.tableLayoutPanel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize) (this.EditModePictureBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize) (this.DeleteModePictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.EditModePictureBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DeleteModePictureBox)).BeginInit();
             this.StatusStrip.SuspendLayout();
             this.NotifyMenu.SuspendLayout();
             this.ProfileGroupBox.SuspendLayout();
@@ -113,10 +106,16 @@
             // 
             this.MenuStrip.BackColor = System.Drawing.SystemColors.Control;
             this.MenuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.ServerToolStripMenuItem, this.ModeToolStripMenuItem, this.SubscribeToolStripMenuItem, this.OptionsToolStripMenuItem, this.HelpToolStripMenuItem, this.exitToolStripMenuItem, this.AboutToolStripButton, this.NewVersionLabel, this.VersionLabel
-            });
+            this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ServerToolStripMenuItem,
+            this.ModeToolStripMenuItem,
+            this.SubscribeToolStripMenuItem,
+            this.OptionsToolStripMenuItem,
+            this.HelpToolStripMenuItem,
+            this.exitToolStripMenuItem,
+            this.AboutToolStripButton,
+            this.NewVersionLabel,
+            this.VersionLabel});
             this.MenuStrip.Location = new System.Drawing.Point(0, 0);
             this.MenuStrip.Name = "MenuStrip";
             this.MenuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
@@ -125,10 +124,8 @@
             // 
             // ServerToolStripMenuItem
             // 
-            this.ServerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.ImportServersFromClipboardToolStripMenuItem
-            });
+            this.ServerToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ImportServersFromClipboardToolStripMenuItem});
             this.ServerToolStripMenuItem.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1);
             this.ServerToolStripMenuItem.Name = "ServerToolStripMenuItem";
             this.ServerToolStripMenuItem.Size = new System.Drawing.Size(57, 21);
@@ -143,7 +140,9 @@
             // 
             // ModeToolStripMenuItem
             // 
-            this.ModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.CreateProcessModeToolStripMenuItem, this.CreateRouteTableRuleToolStripMenuItem, this.ReloadModesToolStripMenuItem});
+            this.ModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.CreateProcessModeToolStripMenuItem,
+            this.CreateRouteTableRuleToolStripMenuItem});
             this.ModeToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.ModeToolStripMenuItem.Name = "ModeToolStripMenuItem";
             this.ModeToolStripMenuItem.Size = new System.Drawing.Size(55, 21);
@@ -163,19 +162,11 @@
             this.CreateRouteTableRuleToolStripMenuItem.Text = "Create Route Table Rule";
             this.CreateRouteTableRuleToolStripMenuItem.Click += new System.EventHandler(this.createRouteTableModeToolStripMenuItem_Click);
             // 
-            // ReloadModesToolStripMenuItem
-            // 
-            this.ReloadModesToolStripMenuItem.Name = "ReloadModesToolStripMenuItem";
-            this.ReloadModesToolStripMenuItem.Size = new System.Drawing.Size(217, 22);
-            this.ReloadModesToolStripMenuItem.Text = "Reload Modes";
-            this.ReloadModesToolStripMenuItem.Click += new System.EventHandler(this.ReloadModesToolStripMenuItem_Click);
-            // 
             // SubscribeToolStripMenuItem
             // 
-            this.SubscribeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.ManageSubscribeLinksToolStripMenuItem, this.UpdateServersFromSubscribeLinksToolStripMenuItem, this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem
-            });
+            this.SubscribeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ManageSubscribeLinksToolStripMenuItem,
+            this.UpdateServersFromSubscribeLinksToolStripMenuItem});
             this.SubscribeToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.SubscribeToolStripMenuItem.Name = "SubscribeToolStripMenuItem";
             this.SubscribeToolStripMenuItem.Size = new System.Drawing.Size(77, 21);
@@ -184,30 +175,24 @@
             // ManageSubscribeLinksToolStripMenuItem
             // 
             this.ManageSubscribeLinksToolStripMenuItem.Name = "ManageSubscribeLinksToolStripMenuItem";
-            this.ManageSubscribeLinksToolStripMenuItem.Size = new System.Drawing.Size(360, 22);
+            this.ManageSubscribeLinksToolStripMenuItem.Size = new System.Drawing.Size(294, 22);
             this.ManageSubscribeLinksToolStripMenuItem.Text = "Manage Subscribe Links";
             this.ManageSubscribeLinksToolStripMenuItem.Click += new System.EventHandler(this.ManageSubscribeLinksToolStripMenuItem_Click);
             // 
             // UpdateServersFromSubscribeLinksToolStripMenuItem
             // 
             this.UpdateServersFromSubscribeLinksToolStripMenuItem.Name = "UpdateServersFromSubscribeLinksToolStripMenuItem";
-            this.UpdateServersFromSubscribeLinksToolStripMenuItem.Size = new System.Drawing.Size(360, 22);
+            this.UpdateServersFromSubscribeLinksToolStripMenuItem.Size = new System.Drawing.Size(294, 22);
             this.UpdateServersFromSubscribeLinksToolStripMenuItem.Text = "Update Servers From Subscribe Links";
             this.UpdateServersFromSubscribeLinksToolStripMenuItem.Click += new System.EventHandler(this.UpdateServersFromSubscribeLinksToolStripMenuItem_Click);
             // 
-            // UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem
-            // 
-            this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Name = "UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem";
-            this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Size = new System.Drawing.Size(360, 22);
-            this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Text = "Update Servers From Subscribe Links With Proxy";
-            this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Click += new System.EventHandler(this.UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem_Click);
-            // 
             // OptionsToolStripMenuItem
             // 
-            this.OptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.OpenDirectoryToolStripMenuItem, this.CleanDNSCacheToolStripMenuItem, this.UpdateACLToolStripMenuItem, this.updateACLWithProxyToolStripMenuItem, this.updatePACToolStripMenuItem, this.UninstallServiceToolStripMenuItem, this.UninstallTapDriverToolStripMenuItem, this.removeNetchFirewallRulesToolStripMenuItem
-            });
+            this.OptionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.OpenDirectoryToolStripMenuItem,
+            this.CleanDNSCacheToolStripMenuItem,
+            this.UninstallServiceToolStripMenuItem,
+            this.removeNetchFirewallRulesToolStripMenuItem});
             this.OptionsToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.OptionsToolStripMenuItem.Name = "OptionsToolStripMenuItem";
             this.OptionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21);
@@ -227,27 +212,6 @@
             this.CleanDNSCacheToolStripMenuItem.Text = "Clean DNS Cache";
             this.CleanDNSCacheToolStripMenuItem.Click += new System.EventHandler(this.CleanDNSCacheToolStripMenuItem_Click);
             // 
-            // UpdateACLToolStripMenuItem
-            // 
-            this.UpdateACLToolStripMenuItem.Name = "UpdateACLToolStripMenuItem";
-            this.UpdateACLToolStripMenuItem.Size = new System.Drawing.Size(243, 22);
-            this.UpdateACLToolStripMenuItem.Text = "Update ACL";
-            this.UpdateACLToolStripMenuItem.Click += new System.EventHandler(this.updateACLToolStripMenuItem_Click);
-            // 
-            // updateACLWithProxyToolStripMenuItem
-            // 
-            this.updateACLWithProxyToolStripMenuItem.Name = "updateACLWithProxyToolStripMenuItem";
-            this.updateACLWithProxyToolStripMenuItem.Size = new System.Drawing.Size(243, 22);
-            this.updateACLWithProxyToolStripMenuItem.Text = "Update ACL with proxy";
-            this.updateACLWithProxyToolStripMenuItem.Click += new System.EventHandler(this.updateACLWithProxyToolStripMenuItem_Click);
-            // 
-            // updatePACToolStripMenuItem
-            // 
-            this.updatePACToolStripMenuItem.Name = "updatePACToolStripMenuItem";
-            this.updatePACToolStripMenuItem.Size = new System.Drawing.Size(243, 22);
-            this.updatePACToolStripMenuItem.Text = "Update PAC";
-            this.updatePACToolStripMenuItem.Click += new System.EventHandler(this.updatePACToolStripMenuItem_Click);
-            // 
             // UninstallServiceToolStripMenuItem
             // 
             this.UninstallServiceToolStripMenuItem.Name = "UninstallServiceToolStripMenuItem";
@@ -255,13 +219,6 @@
             this.UninstallServiceToolStripMenuItem.Text = "Uninstall NF Service";
             this.UninstallServiceToolStripMenuItem.Click += new System.EventHandler(this.UninstallServiceToolStripMenuItem_Click);
             // 
-            // UninstallTapDriverToolStripMenuItem
-            // 
-            this.UninstallTapDriverToolStripMenuItem.Name = "UninstallTapDriverToolStripMenuItem";
-            this.UninstallTapDriverToolStripMenuItem.Size = new System.Drawing.Size(243, 22);
-            this.UninstallTapDriverToolStripMenuItem.Text = "Uninstall TUN/TAP driver";
-            this.UninstallTapDriverToolStripMenuItem.Click += new System.EventHandler(this.UninstallTapDriverToolStripMenuItem_Click);
-            // 
             // removeNetchFirewallRulesToolStripMenuItem
             // 
             this.removeNetchFirewallRulesToolStripMenuItem.Name = "removeNetchFirewallRulesToolStripMenuItem";
@@ -271,10 +228,9 @@
             // 
             // HelpToolStripMenuItem
             // 
-            this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.CheckForUpdatesToolStripMenuItem, this.fAQToolStripMenuItem
-            });
+            this.HelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.CheckForUpdatesToolStripMenuItem,
+            this.fAQToolStripMenuItem});
             this.HelpToolStripMenuItem.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
             this.HelpToolStripMenuItem.Size = new System.Drawing.Size(47, 21);
@@ -413,9 +369,9 @@
             // 
             // ModeComboBox
             // 
-            this.ModeComboBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
             this.ModeComboBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.ModeComboBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.ModeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.ModeComboBox.FormattingEnabled = true;
             this.ModeComboBox.IntegralHeight = false;
             this.ModeComboBox.Location = new System.Drawing.Point(54, 33);
@@ -423,7 +379,7 @@
             this.ModeComboBox.Size = new System.Drawing.Size(546, 24);
             this.ModeComboBox.TabIndex = 2;
             this.ModeComboBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ComboBox_DrawItem);
-            this.ModeComboBox.SelectedIndexChanged += new System.EventHandler(this.ModeComboBox_SelectedIndexChanged);
+            this.ModeComboBox.SelectionChangeCommitted += new System.EventHandler(this.ModeComboBox_SelectionChangeCommitted);
             // 
             // ServerComboBox
             // 
@@ -438,7 +394,7 @@
             this.ServerComboBox.Size = new System.Drawing.Size(546, 24);
             this.ServerComboBox.TabIndex = 1;
             this.ServerComboBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ComboBox_DrawItem);
-            this.ServerComboBox.SelectedIndexChanged += new System.EventHandler(this.ServerComboBox_SelectedIndexChanged);
+            this.ServerComboBox.SelectionChangeCommitted += new System.EventHandler(this.ServerComboBox_SelectionChangeCommitted);
             // 
             // tableLayoutPanel2
             // 
@@ -550,10 +506,14 @@
             // StatusStrip
             // 
             this.StatusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.StatusLabel, this.UsedBandwidthLabel, this.DownloadSpeedLabel, this.UploadSpeedLabel, this.blankToolStripStatusLabel, this.NatTypeStatusLabel, this.NatTypeStatusLightLabel
-            });
+            this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.StatusLabel,
+            this.UsedBandwidthLabel,
+            this.DownloadSpeedLabel,
+            this.UploadSpeedLabel,
+            this.blankToolStripStatusLabel,
+            this.NatTypeStatusLabel,
+            this.NatTypeStatusLightLabel});
             this.StatusStrip.Location = new System.Drawing.Point(0, 272);
             this.StatusStrip.Name = "StatusStrip";
             this.StatusStrip.Size = new System.Drawing.Size(740, 22);
@@ -616,7 +576,7 @@
             // 
             // ControlButton
             // 
-            this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.ControlButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.ControlButton.Location = new System.Drawing.Point(631, 3);
             this.ControlButton.Name = "ControlButton";
             this.ControlButton.Size = new System.Drawing.Size(75, 27);
@@ -635,10 +595,9 @@
             // NotifyMenu
             // 
             this.NotifyMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.NotifyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[]
-            {
-                this.ShowMainFormToolStripButton, this.ExitToolStripButton
-            });
+            this.NotifyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ShowMainFormToolStripButton,
+            this.ExitToolStripButton});
             this.NotifyMenu.Name = "NotifyMenu";
             this.NotifyMenu.ShowItemToolTips = false;
             this.NotifyMenu.Size = new System.Drawing.Size(108, 48);
@@ -659,7 +618,7 @@
             // 
             // SettingsButton
             // 
-            this.SettingsButton.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.SettingsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.SettingsButton.Location = new System.Drawing.Point(1, 3);
             this.SettingsButton.Name = "SettingsButton";
             this.SettingsButton.Size = new System.Drawing.Size(72, 27);
@@ -728,7 +687,7 @@
             this.Controls.Add(this.MenuStrip);
             this.Controls.Add(this.StatusStrip);
             this.Controls.Add(this.flowLayoutPanel1);
-            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (134)));
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
@@ -744,13 +703,13 @@
             this.configLayoutPanel.ResumeLayout(false);
             this.configLayoutPanel.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize) (this.EditServerPictureBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize) (this.CopyLinkPictureBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize) (this.DeleteServerPictureBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize) (this.SpeedPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.EditServerPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CopyLinkPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DeleteServerPictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.SpeedPictureBox)).EndInit();
             this.tableLayoutPanel3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize) (this.EditModePictureBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize) (this.DeleteModePictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.EditModePictureBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DeleteModePictureBox)).EndInit();
             this.StatusStrip.ResumeLayout(false);
             this.StatusStrip.PerformLayout();
             this.NotifyMenu.ResumeLayout(false);
@@ -760,6 +719,7 @@
             this.ButtomControlContainerControl.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
+
         }
 
         private System.Windows.Forms.ToolStripMenuItem CreateRouteTableRuleToolStripMenuItem;
@@ -783,7 +743,7 @@
         private System.Windows.Forms.ToolStripMenuItem ImportServersFromClipboardToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ManageSubscribeLinksToolStripMenuItem;
         private System.Windows.Forms.MenuStrip MenuStrip;
-        private System.Windows.Forms.SearchComboBox ModeComboBox;
+        private System.Windows.Forms.ComboBox ModeComboBox;
         private System.Windows.Forms.Label ModeLabel;
         private System.Windows.Forms.ToolStripMenuItem ModeToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem;
@@ -796,9 +756,7 @@
         private System.Windows.Forms.Label ProfileLabel;
         private System.Windows.Forms.TextBox ProfileNameText;
         private System.Windows.Forms.TableLayoutPanel ProfileTable;
-        private System.Windows.Forms.ToolStripMenuItem UninstallTapDriverToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem CheckForUpdatesToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem ReloadModesToolStripMenuItem;
         private System.Windows.Forms.ComboBox ServerComboBox;
         private System.Windows.Forms.Label ServerLabel;
         private System.Windows.Forms.ToolStripMenuItem ServerToolStripMenuItem;
@@ -811,10 +769,7 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.ToolStripMenuItem UninstallServiceToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem UpdateACLToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem updateACLWithProxyToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem UpdateServersFromSubscribeLinksToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem;
         private System.Windows.Forms.ToolStripStatusLabel UploadSpeedLabel;
         private System.Windows.Forms.ToolStripStatusLabel UsedBandwidthLabel;
         private System.Windows.Forms.ToolStripLabel NewVersionLabel;
@@ -827,6 +782,5 @@
 
         private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
         private System.Windows.Forms.ContainerControl ButtomControlContainerControl;
-        private System.Windows.Forms.ToolStripMenuItem updatePACToolStripMenuItem;
     }
 }

Netch/Forms/MainForm.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -30,7 +30,6 @@ namespace Netch.Forms
 
         private readonly Dictionary<string, object> _mainFormText = new();
 
-        private bool _comboBoxInitialized;
         private bool _textRecorded;
 
         public MainForm()
@@ -43,25 +42,12 @@ namespace Netch.Forms
             #region i18N Translations
 
             _mainFormText.Add(UninstallServiceToolStripMenuItem.Name, new[] {"Uninstall {0}", "NF Service"});
-            _mainFormText.Add(UninstallTapDriverToolStripMenuItem.Name, new[] {"Uninstall {0}", "TUN/TAP driver"});
 
             #endregion
 
             // 监听电源事件
             SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
 
-            ModeComboBox.KeyUp += (_, args) =>
-            {
-                switch (args.KeyData)
-                {
-                    case Keys.Escape:
-                    {
-                        SelectLastMode();
-                        return;
-                    }
-                }
-            };
-
             CheckForIllegalCrossThreadCalls = false;
         }
 
@@ -85,8 +71,6 @@ namespace Netch.Forms
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            OnlyInstance.Called += OnCalled;
-
             // 计算 ComboBox绘制 目标宽度
             RecordSize();
 
@@ -95,7 +79,6 @@ namespace Netch.Forms
 
             ModeHelper.Load();
             LoadModes();
-            _comboBoxInitialized = true;
 
             // 加载翻译
             TranslateControls();
@@ -106,10 +89,6 @@ namespace Netch.Forms
             // 加载快速配置
             LoadProfiles();
 
-            // 打开软件时启动加速，产生开始按钮点击事件
-            if (Global.Settings.StartWhenOpened)
-                ControlButton_Click(null, null);
-
             Task.Run(() =>
             {
                 // 检查更新
@@ -117,11 +96,15 @@ namespace Netch.Forms
                     CheckUpdate();
             });
 
-            Task.Run(async () =>
+            Task.Run(() =>
             {
                 // 检查订阅更新
                 if (Global.Settings.UpdateServersWhenOpened)
-                    await UpdateServersFromSubscribe(Global.Settings.UseProxyToUpdateSubscription);
+                    UpdateServersFromSubscribe().Wait();
+
+                // 打开软件时启动加速，产生开始按钮点击事件
+                if (Global.Settings.StartWhenOpened)
+                    ControlButton_Click(null, null);
             });
         }
 
@@ -239,8 +222,12 @@ namespace Netch.Forms
             }
         }
 
-        private void AddServerToolStripMenuItem_Click(object sender, EventArgs e)
+        private void AddServerToolStripMenuItem_Click([NotNull] object? sender, EventArgs? e)
         {
+            if (sender == null)
+                throw new ArgumentNullException(nameof(sender));
+
+            // TODO get Util from Tag
             var s = ((ToolStripMenuItem) sender).Text;
 
             var start = s.IndexOf("[", StringComparison.Ordinal) + 1;
@@ -266,25 +253,6 @@ namespace Netch.Forms
             Show();
         }
 
-        private void ReloadModesToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            Enabled = false;
-            try
-            {
-                ModeHelper.Load();
-                LoadModes();
-                NotifyTip(i18N.Translate("Modes have been reload"));
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
-            finally
-            {
-                Enabled = true;
-            }
-        }
-
         #endregion
 
         #region Subscription
@@ -299,33 +267,16 @@ namespace Netch.Forms
 
         private async void UpdateServersFromSubscribeLinksToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Global.Settings.UseProxyToUpdateSubscription = false;
             await UpdateServersFromSubscribe();
         }
 
-        private async void UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            Global.Settings.UseProxyToUpdateSubscription = true;
-            await UpdateServersFromSubscribe(true);
-        }
-
-        private async Task UpdateServersFromSubscribe(bool useProxy = false)
+        private async Task UpdateServersFromSubscribe()
         {
             void DisableItems(bool v)
             {
                 MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ProfileGroupBox.Enabled = ControlButton.Enabled = v;
             }
 
-            var server = ServerComboBox.SelectedItem as Server;
-            if (useProxy)
-            {
-                if (server == null)
-                {
-                    MessageBoxX.Show(i18N.Translate("Please select a server first"));
-                    return;
-                }
-            }
-
             if (Global.Settings.SubscribeLink.Count <= 0)
             {
                 MessageBoxX.Show(i18N.Translate("No subscription link"));
@@ -334,22 +285,10 @@ namespace Netch.Forms
 
             StatusText(i18N.Translate("Starting update subscription"));
             DisableItems(false);
+
             try
             {
-                string? proxyServer = null;
-                if (useProxy)
-                {
-                    var mode = new Models.Mode
-                    {
-                        Remark = "ProxyUpdate",
-                        Type = 5
-                    };
-
-                    await MainController.Start(server!, mode);
-                    proxyServer = $"http://127.0.0.1:{Global.Settings.HTTPLocalPort}";
-                }
-
-                await Subscription.UpdateServersAsync(proxyServer);
+                await Subscription.UpdateServersAsync();
 
                 LoadServers();
                 Configuration.Save();
@@ -362,16 +301,6 @@ namespace Netch.Forms
             }
             finally
             {
-                if (useProxy)
-                    try
-                    {
-                        await MainController.Stop();
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
-
                 DisableItems(true);
             }
         }
@@ -384,21 +313,27 @@ namespace Netch.Forms
         {
             Task.Run(() =>
             {
-                void OnNewVersionNotFound(object o, EventArgs args)
+                void OnNewVersionNotFound(object? o, EventArgs? args)
                 {
-                    UpdateChecker.NewVersionNotFound -= OnNewVersionNotFound;
                     NotifyTip(i18N.Translate("Already latest version"));
                 }
 
-                void OnNewVersionFoundFailed(object o, EventArgs args)
+                void OnNewVersionFoundFailed(object? o, EventArgs? args)
                 {
-                    UpdateChecker.NewVersionFoundFailed -= OnNewVersionFoundFailed;
                     NotifyTip(i18N.Translate("New version found failed"), info: false);
                 }
 
-                UpdateChecker.NewVersionNotFound += OnNewVersionNotFound;
-                UpdateChecker.NewVersionFoundFailed += OnNewVersionFoundFailed;
-                CheckUpdate();
+                try
+                {
+                    UpdateChecker.NewVersionNotFound += OnNewVersionNotFound;
+                    UpdateChecker.NewVersionFoundFailed += OnNewVersionFoundFailed;
+                    CheckUpdate();
+                }
+                finally
+                {
+                    UpdateChecker.NewVersionNotFound -= OnNewVersionNotFound;
+                    UpdateChecker.NewVersionFoundFailed -= OnNewVersionFoundFailed;
+                }
             });
         }
 
@@ -429,90 +364,6 @@ namespace Netch.Forms
             }
         }
 
-        private void updateACLWithProxyToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            UpdateACL(true);
-        }
-
-        private void updateACLToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            UpdateACL(false);
-        }
-
-        private async void UpdateACL(bool useProxy)
-        {
-            Enabled = false;
-            StatusText(i18N.TranslateFormat("Updating {0}", "ACL"));
-            try
-            {
-                if (useProxy)
-                {
-                    if (!(ServerComboBox.SelectedItem is Server server))
-                    {
-                        MessageBoxX.Show(i18N.Translate("Please select a server first"));
-                        return;
-                    }
-                    else
-                    {
-                        var mode = new Models.Mode
-                        {
-                            Remark = "ProxyUpdate",
-                            Type = 5
-                        };
-
-                        await MainController.Start(server, mode);
-                    }
-                }
-
-                var req = WebUtil.CreateRequest(Global.Settings.ACL);
-                if (useProxy)
-                    req.Proxy = new WebProxy($"http://127.0.0.1:{Global.Settings.HTTPLocalPort}");
-
-                await WebUtil.DownloadFileAsync(req, Path.Combine(Global.NetchDir, Global.UserACL));
-                NotifyTip(i18N.Translate("ACL updated successfully"));
-            }
-            catch (Exception e)
-            {
-                NotifyTip(i18N.Translate("ACL update failed") + "\n" + e.Message, info: false);
-                Logging.Error("更新 ACL 失败！" + e);
-            }
-            finally
-            {
-                if (useProxy)
-                    await MainController.Stop();
-
-                StatusText();
-                Enabled = true;
-            }
-        }
-
-        private async void updatePACToolStripMenuItem_Click(object sender, EventArgs eventArgs)
-        {
-            Enabled = false;
-
-            StatusText(i18N.TranslateFormat("Updating {0}", "PAC"));
-            try
-            {
-                var req = WebUtil.CreateRequest(Global.Settings.PAC);
-
-                var pac = Path.Combine(Global.NetchDir, "bin\\pac.txt");
-
-                await WebUtil.DownloadFileAsync(req, pac);
-
-                NotifyTip(i18N.Translate("PAC updated successfully"));
-            }
-            catch (Exception e)
-            {
-                NotifyTip(i18N.Translate("PAC update failed") + "\n" + e.Message, info: false);
-                Logging.Error("更新 PAC 失败！" + e);
-            }
-            finally
-            {
-                StatusText();
-                Enabled = true;
-            }
-        }
-
         private async void UninstallServiceToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Enabled = false;
@@ -532,26 +383,6 @@ namespace Netch.Forms
             }
         }
 
-        private async void UninstallTapDriverToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            Enabled = false;
-            StatusText(i18N.TranslateFormat("Uninstalling {0}", "TUN/TAP driver"));
-            try
-            {
-                await Task.Run(TUNTAP.deltapall);
-                NotifyTip(i18N.TranslateFormat("{0} has been uninstalled", "TUN/TAP driver"));
-            }
-            catch (Exception exception)
-            {
-                Logging.Error($"卸载 TUN/TAP 适配器失败: {exception}");
-            }
-            finally
-            {
-                StatusText();
-                Enabled = true;
-            }
-        }
-
         private void RemoveNetchFirewallRulesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Firewall.RemoveNetchFwRules();
@@ -572,6 +403,48 @@ namespace Netch.Forms
             Utils.Utils.Open($"https://github.com/{UpdateChecker.Owner}/{UpdateChecker.Repo}/releases");
         }
 
+        private async void NewVersionLabel_Click(object sender, EventArgs e)
+        {
+            if (ModifierKeys == Keys.Control || !UpdateChecker.LatestRelease!.assets.Any())
+            {
+                Utils.Utils.Open(UpdateChecker.LatestVersionUrl!);
+                return;
+            }
+
+            if (MessageBoxX.Show(i18N.Translate($"Download and install now?\n\n{UpdateChecker.GetLatestReleaseContent()}"), confirm: true) !=
+                DialogResult.OK)
+                return;
+
+            NotifyTip(i18N.Translate("Start downloading new version"));
+            NewVersionLabel.Enabled = false;
+            NewVersionLabel.Text = "...";
+
+            try
+            {
+                await Task.Run(() =>
+                {
+                    Updater.Updater.DownloadAndUpdate(Path.Combine(Global.NetchDir, "data"),
+                        Global.NetchDir,
+                        (_, args) => BeginInvoke(new Action(() => NewVersionLabel.Text = $"{args.ProgressPercentage}%")));
+                });
+            }
+            catch (Exception exception)
+            {
+                if (exception is not MessageException)
+                {
+                    Logging.Error($"更新失败: {exception}");
+                    Utils.Utils.Open(Logging.LogFile);
+                }
+
+                NotifyTip(exception.Message, info: false);
+            }
+            finally
+            {
+                NewVersionLabel.Visible = false;
+                NewVersionLabel.Enabled = true;
+            }
+        }
+
         private void AboutToolStripButton_Click(object sender, EventArgs e)
         {
             Hide();
@@ -593,9 +466,7 @@ namespace Netch.Forms
             if (!IsWaiting())
             {
                 // 停止
-                State = State.Stopping;
-                await MainController.Stop();
-                State = State.Stopped;
+                await StopAsyncCore();
                 return;
             }
 
@@ -614,20 +485,17 @@ namespace Netch.Forms
                 return;
             }
 
-            // 清除模式搜索框文本选择
-            ModeComboBox.Select(0, 0);
-
             State = State.Starting;
 
             try
             {
-                await MainController.Start(server, mode);
+                await MainController.StartAsync(server, mode);
             }
             catch (Exception exception)
             {
                 State = State.Stopped;
                 StatusText(i18N.Translate("Start failed"));
-                MessageBoxX.Show(exception.Message);
+                MessageBoxX.Show(exception.Message, LogLevel.ERROR);
                 return;
             }
 
@@ -697,13 +565,9 @@ namespace Netch.Forms
 
         private void LoadServers()
         {
-            var comboBoxInitialized = _comboBoxInitialized;
-            _comboBoxInitialized = false;
-
             ServerComboBox.Items.Clear();
             ServerComboBox.Items.AddRange(Global.Settings.Server.ToArray());
             SelectLastServer();
-            _comboBoxInitialized = comboBoxInitialized;
         }
 
         public void SelectLastServer()
@@ -718,11 +582,8 @@ namespace Netch.Forms
             // 如果当前 ServerComboBox 中没元素，不做处理
         }
 
-        private void ServerComboBox_SelectedIndexChanged(object sender, EventArgs o)
+        private void ServerComboBox_SelectionChangeCommitted(object sender, EventArgs o)
         {
-            if (!_comboBoxInitialized)
-                return;
-
             Global.Settings.ServerComboBoxSelectedIndex = ServerComboBox.SelectedIndex;
         }
 
@@ -762,7 +623,7 @@ namespace Netch.Forms
                 ServerHelper.DelayTestHelper.TestDelayFinished += OnTestDelayFinished;
                 _ = Task.Run(ServerHelper.DelayTestHelper.TestAllDelay);
 
-                void OnTestDelayFinished(object o1, EventArgs e1)
+                void OnTestDelayFinished(object? o1, EventArgs? e1)
                 {
                     Refresh();
 
@@ -821,14 +682,10 @@ namespace Netch.Forms
 
         public void LoadModes()
         {
-            var comboBoxInitialized = _comboBoxInitialized;
-            _comboBoxInitialized = false;
-
             ModeComboBox.Items.Clear();
-            ModeComboBox.Items.AddRange(Global.Modes.ToArray());
+            ModeComboBox.Items.AddRange(Global.Modes.Cast<object>().ToArray());
             ModeComboBox.Tag = null;
             SelectLastMode();
-            _comboBoxInitialized = comboBoxInitialized;
         }
 
         public void SelectLastMode()
@@ -843,11 +700,8 @@ namespace Netch.Forms
             // 如果当前 ModeComboBox 中没元素，不做处理
         }
 
-        private void ModeComboBox_SelectedIndexChanged(object sender, EventArgs o)
+        private void ModeComboBox_SelectionChangeCommitted(object sender, EventArgs o)
         {
-            if (!_comboBoxInitialized)
-                return;
-
             try
             {
                 Global.Settings.ModeComboBoxSelectedIndex = Global.Modes.IndexOf((Models.Mode) ModeComboBox.SelectedItem);
@@ -978,7 +832,6 @@ namespace Netch.Forms
         private void ActiveProfile(Profile profile)
         {
             ProfileNameText.Text = profile.ProfileName;
-            ModeComboBox.ResetCompletionList();
 
             var server = ServerComboBox.Items.Cast<Server>().FirstOrDefault(s => s.Remark.Equals(profile.ServerRemark));
             var mode = ModeComboBox.Items.Cast<Models.Mode>().FirstOrDefault(m => m.Remark.Equals(profile.ModeRemark));
@@ -1008,8 +861,11 @@ namespace Netch.Forms
             return profile;
         }
 
-        private async void ProfileButton_Click(object sender, EventArgs e)
+        private async void ProfileButton_Click([NotNull] object? sender, EventArgs? e)
         {
+            if (sender == null)
+                throw new ArgumentNullException(nameof(sender));
+
             var profileButton = (Button) sender;
             var profile = (Profile?) profileButton.Tag;
             var index = ProfileTable.Controls.IndexOf(profileButton);
@@ -1097,10 +953,7 @@ namespace Netch.Forms
                         EditServerPictureBox.Enabled = DeleteModePictureBox.Enabled = DeleteServerPictureBox.Enabled = enabled;
 
                     // 启动需要禁用的控件
-                    UninstallServiceToolStripMenuItem.Enabled = UpdateACLToolStripMenuItem.Enabled = updateACLWithProxyToolStripMenuItem.Enabled =
-                        updatePACToolStripMenuItem.Enabled = UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled =
-                            UpdateServersFromSubscribeLinksWithProxyToolStripMenuItem.Enabled = UninstallTapDriverToolStripMenuItem.Enabled =
-                                ReloadModesToolStripMenuItem.Enabled = enabled;
+                    UninstallServiceToolStripMenuItem.Enabled = UpdateServersFromSubscribeLinksToolStripMenuItem.Enabled = enabled;
                 }
 
                 _state = value;
@@ -1152,6 +1005,27 @@ namespace Netch.Forms
             }
         }
 
+        private async Task StopAsyncCore()
+        {
+            State = State.Stopping;
+            await MainController.StopAsync();
+            State = State.Stopped;
+        }
+
+        public void Stop()
+        {
+            if (IsWaiting())
+                return;
+
+            if (InvokeRequired)
+            {
+                Invoke(new Action(Stop));
+                return;
+            }
+
+            StopAsyncCore().Wait();
+        }
+
         private bool IsWaiting()
         {
             return State == State.Waiting || State == State.Stopped;
@@ -1231,7 +1105,7 @@ namespace Netch.Forms
         {
             if (natType > 0 && natType < 5)
             {
-                NatTypeStatusLightLabel.Visible = Global.Flags.IsWindows10Upper;
+                NatTypeStatusLightLabel.Visible = Flags.IsWindows10Upper;
                 var c = natType switch
                         {
                             1 => Color.LimeGreen,
@@ -1361,28 +1235,13 @@ namespace Netch.Forms
                 if (File.Exists(file))
                     File.Delete(file);
 
-            if (!IsWaiting())
-                await MainController.Stop();
+            if (IsWaiting())
+                await StopAsyncCore();
 
             Dispose();
             Environment.Exit(Environment.ExitCode);
         }
 
-        private void OnCalled(object sender, OnlyInstance.Commands e)
-        {
-            switch (e)
-            {
-                case OnlyInstance.Commands.Show:
-                    NotifyIcon_MouseDoubleClick(null, null);
-                    break;
-                case OnlyInstance.Commands.Exit:
-                    Exit(true);
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(e), e, null);
-            }
-        }
-
         #region FormClosingButton
 
         private bool _isFirstCloseWindow = true;
@@ -1409,43 +1268,24 @@ namespace Netch.Forms
 
         private void CheckUpdate()
         {
-            UpdateChecker.NewVersionFound += (_, _) =>
-            {
-                NotifyTip($"{i18N.Translate(@"New version available", ": ")}{UpdateChecker.LatestVersionNumber}");
-                NewVersionLabel.Visible = true;
-            };
-
-            UpdateChecker.Check(Global.Settings.CheckBetaUpdate).Wait();
-        }
-
-        private async void NewVersionLabel_Click(object sender, EventArgs e)
-        {
-            if (ModifierKeys == Keys.Control || !UpdateChecker.LatestRelease!.assets.Any())
-            {
-                Utils.Utils.Open(UpdateChecker.LatestVersionUrl!);
-                return;
-            }
-
-            if (MessageBoxX.Show(i18N.Translate("Download and install now?"), confirm: true) != DialogResult.OK)
-                return;
-
-            NotifyTip(i18N.Translate("Start downloading new version"));
-
-            NewVersionLabel.Enabled = false;
-            NewVersionLabel.Text = "...";
             try
             {
-                void OnDownloadProgressChanged(object o1, DownloadProgressChangedEventArgs args)
-                {
-                    BeginInvoke(new Action(() => { NewVersionLabel.Text = $"{args.ProgressPercentage}%"; }));
-                }
-
-                await Updater.Updater.DownloadAndUpdate(Path.Combine(Global.NetchDir, "data"), Global.NetchDir, OnDownloadProgressChanged);
+                UpdateChecker.NewVersionFound += OnUpdateCheckerOnNewVersionFound;
+                UpdateChecker.Check(Global.Settings.CheckBetaUpdate).Wait();
+                if (Flags.AlwaysShowNewVersionFound)
+                    OnUpdateCheckerOnNewVersionFound(null!, null!);
             }
-            catch (Exception exception)
+            finally
             {
-                Logging.Error(exception.Message);
-                NotifyTip(exception.Message);
+                UpdateChecker.NewVersionFound -= OnUpdateCheckerOnNewVersionFound;
+            }
+
+            void OnUpdateCheckerOnNewVersionFound(object? o, EventArgs? eventArgs)
+            {
+                NotifyTip($"{i18N.Translate(@"New version available", ": ")}{UpdateChecker.LatestVersionNumber}");
+                NewVersionLabel.Text = i18N.Translate("New version available");
+                NewVersionLabel.Enabled = true;
+                NewVersionLabel.Visible = true;
             }
         }
 
@@ -1491,8 +1331,14 @@ namespace Netch.Forms
 
         #region NotifyIcon
 
-        private void ShowMainFormToolStripButton_Click(object sender, EventArgs e)
+        public void ShowMainFormToolStripButton_Click(object sender, EventArgs e)
         {
+            if (InvokeRequired)
+            {
+                Invoke(new Action(() => ShowMainFormToolStripButton_Click(sender, e)));
+                return;
+            }
+
             if (WindowState == FormWindowState.Minimized)
             {
                 Visible = true;
@@ -1525,7 +1371,7 @@ namespace Netch.Forms
 
         public void NotifyTip(string text, int timeout = 0, bool info = true)
         {
-            // 会阻塞线程 timeout 秒
+            // 会阻塞线程 timeout 秒(?)
             NotifyIcon.ShowBalloonTip(timeout, UpdateChecker.Name, text, info ? ToolTipIcon.Info : ToolTipIcon.Error);
         }
 

Netch/Forms/MainForm.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Netch/Forms/Mode/ModeEditorUtils.cs

@@ -13,5 +13,15 @@ namespace Netch.Forms.Mode
 
             return fileName.ToString();
         }
+
+        public static string GetCustomModeRelativePath(string name)
+        {
+            if (name == string.Empty)
+                return string.Empty;
+
+            var safeFileName = ToSafeFileName(name);
+            var relativePath = $"Custom\\{safeFileName}.txt";
+            return relativePath;
+        }
     }
 }

Netch/Forms/Mode/Process.Designer.cs

@@ -31,129 +31,40 @@ namespace Netch.Forms.Mode
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Process));
             this.ConfigurationGroupBox = new System.Windows.Forms.GroupBox();
-            this.UseCustomFilenameBox = new System.Windows.Forms.CheckBox();
+            this.RemarkLabel = new System.Windows.Forms.Label();
+            this.RemarkTextBox = new System.Windows.Forms.TextBox();
             this.FilenameLabel = new System.Windows.Forms.Label();
             this.FilenameTextBox = new System.Windows.Forms.TextBox();
-            this.ScanButton = new System.Windows.Forms.Button();
-            this.ProcessGroupBox = new System.Windows.Forms.GroupBox();
-            this.AddButton = new System.Windows.Forms.Button();
-            this.ProcessNameTextBox = new System.Windows.Forms.TextBox();
-            this.RuleListBox = new System.Windows.Forms.ListBox();
-            this.RemarkTextBox = new System.Windows.Forms.TextBox();
-            this.RemarkLabel = new System.Windows.Forms.Label();
-            this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ControlButton = new System.Windows.Forms.Button();
-            this.DeleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.containerControl1 = new System.Windows.Forms.ContainerControl();
+            this.RuleRichTextBox = new System.Windows.Forms.RichTextBox();
+            this.ProcessGroupBox = new System.Windows.Forms.GroupBox();
+            this.SelectButton = new System.Windows.Forms.Button();
+            this.ScanButton = new System.Windows.Forms.Button();
+            this.ValidationButton = new System.Windows.Forms.Button();
+            this.ControlButton = new System.Windows.Forms.Button();
             this.ConfigurationGroupBox.SuspendLayout();
-            this.ProcessGroupBox.SuspendLayout();
-            this.contextMenuStrip.SuspendLayout();
             this.containerControl1.SuspendLayout();
+            this.ProcessGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
             // ConfigurationGroupBox
             // 
-            this.ConfigurationGroupBox.Controls.Add(this.containerControl1);
-            this.ConfigurationGroupBox.Controls.Add(this.UseCustomFilenameBox);
+            this.ConfigurationGroupBox.Controls.Add(this.RemarkLabel);
+            this.ConfigurationGroupBox.Controls.Add(this.RemarkTextBox);
             this.ConfigurationGroupBox.Controls.Add(this.FilenameLabel);
             this.ConfigurationGroupBox.Controls.Add(this.FilenameTextBox);
-            this.ConfigurationGroupBox.Controls.Add(this.ScanButton);
+            this.ConfigurationGroupBox.Controls.Add(this.containerControl1);
             this.ConfigurationGroupBox.Controls.Add(this.ProcessGroupBox);
-            this.ConfigurationGroupBox.Controls.Add(this.RemarkTextBox);
-            this.ConfigurationGroupBox.Controls.Add(this.RemarkLabel);
-            this.ConfigurationGroupBox.Location = new System.Drawing.Point(12, 12);
+            this.ConfigurationGroupBox.Controls.Add(this.ControlButton);
+            this.ConfigurationGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ConfigurationGroupBox.Location = new System.Drawing.Point(12, 5);
             this.ConfigurationGroupBox.Name = "ConfigurationGroupBox";
-            this.ConfigurationGroupBox.Size = new System.Drawing.Size(340, 344);
+            this.ConfigurationGroupBox.Size = new System.Drawing.Size(431, 378);
             this.ConfigurationGroupBox.TabIndex = 0;
             this.ConfigurationGroupBox.TabStop = false;
             this.ConfigurationGroupBox.Text = "Configuration";
             // 
-            // UseCustomFilenameBox
-            // 
-            this.UseCustomFilenameBox.AutoSize = true;
-            this.UseCustomFilenameBox.Location = new System.Drawing.Point(84, 76);
-            this.UseCustomFilenameBox.Name = "UseCustomFilenameBox";
-            this.UseCustomFilenameBox.Size = new System.Drawing.Size(152, 21);
-            this.UseCustomFilenameBox.TabIndex = 9;
-            this.UseCustomFilenameBox.Text = "Use Custom Filename";
-            this.UseCustomFilenameBox.UseVisualStyleBackColor = true;
-            // 
-            // FilenameLabel
-            // 
-            this.FilenameLabel.AutoSize = true;
-            this.FilenameLabel.Location = new System.Drawing.Point(12, 55);
-            this.FilenameLabel.Name = "FilenameLabel";
-            this.FilenameLabel.Size = new System.Drawing.Size(59, 17);
-            this.FilenameLabel.TabIndex = 6;
-            this.FilenameLabel.Text = "Filename";
-            // 
-            // FilenameTextBox
-            // 
-            this.FilenameTextBox.Location = new System.Drawing.Point(84, 52);
-            this.FilenameTextBox.Name = "FilenameTextBox";
-            this.FilenameTextBox.Size = new System.Drawing.Size(250, 23);
-            this.FilenameTextBox.TabIndex = 5;
-            this.FilenameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.UseCustomFilenameBox, "Checked", true));;
-            // 
-            // ScanButton
-            // 
-            this.ScanButton.Location = new System.Drawing.Point(6, 315);
-            this.ScanButton.Name = "ScanButton";
-            this.ScanButton.Size = new System.Drawing.Size(75, 23);
-            this.ScanButton.TabIndex = 4;
-            this.ScanButton.Text = "Scan";
-            this.ScanButton.UseVisualStyleBackColor = true;
-            this.ScanButton.Click += new System.EventHandler(this.ScanButton_Click);
-            // 
-            // ProcessGroupBox
-            // 
-            this.ProcessGroupBox.Controls.Add(this.AddButton);
-            this.ProcessGroupBox.Controls.Add(this.ProcessNameTextBox);
-            this.ProcessGroupBox.Location = new System.Drawing.Point(6, 263);
-            this.ProcessGroupBox.Name = "ProcessGroupBox";
-            this.ProcessGroupBox.Size = new System.Drawing.Size(328, 46);
-            this.ProcessGroupBox.TabIndex = 3;
-            this.ProcessGroupBox.TabStop = false;
-            // 
-            // AddButton
-            // 
-            this.AddButton.Location = new System.Drawing.Point(247, 15);
-            this.AddButton.Name = "AddButton";
-            this.AddButton.Size = new System.Drawing.Size(75, 23);
-            this.AddButton.TabIndex = 1;
-            this.AddButton.Text = "Add";
-            this.AddButton.UseVisualStyleBackColor = true;
-            this.AddButton.Click += new System.EventHandler(this.AddButton_Click);
-            // 
-            // ProcessNameTextBox
-            // 
-            this.ProcessNameTextBox.Location = new System.Drawing.Point(6, 15);
-            this.ProcessNameTextBox.Name = "ProcessNameTextBox";
-            this.ProcessNameTextBox.Size = new System.Drawing.Size(222, 23);
-            this.ProcessNameTextBox.TabIndex = 0;
-            // 
-            // RuleListBox
-            // 
-            this.RuleListBox.FormattingEnabled = true;
-            this.RuleListBox.Dock = DockStyle.Fill;
-            this.RuleListBox.ItemHeight = 17;
-            this.RuleListBox.Location = new System.Drawing.Point(0, 0);
-            this.RuleListBox.Name = "RuleListBox";
-            this.RuleListBox.Size = new System.Drawing.Size(328, 157);
-            this.RuleListBox.TabIndex = 2;
-            this.RuleListBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.RuleListBox_MouseUp);
-            // 
-            // RemarkTextBox
-            // 
-            this.RemarkTextBox.Location = new System.Drawing.Point(84, 22);
-            this.RemarkTextBox.Name = "RemarkTextBox";
-            this.RemarkTextBox.Size = new System.Drawing.Size(250, 23);
-            this.RemarkTextBox.TabIndex = 1;
-            this.RemarkTextBox.TextChanged += new System.EventHandler(this.RemarkTextBox_TextChanged);
-            // 
             // RemarkLabel
             // 
             this.RemarkLabel.AutoSize = true;
@@ -163,79 +74,138 @@ namespace Netch.Forms.Mode
             this.RemarkLabel.TabIndex = 0;
             this.RemarkLabel.Text = "Remark";
             // 
-            // contextMenuStrip
+            // RemarkTextBox
             // 
-            this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.DeleteToolStripMenuItem});
-            this.contextMenuStrip.Name = "contextMenuStrip";
-            this.contextMenuStrip.Size = new System.Drawing.Size(153, 48);
+            this.RemarkTextBox.Location = new System.Drawing.Point(84, 22);
+            this.RemarkTextBox.Name = "RemarkTextBox";
+            this.RemarkTextBox.Size = new System.Drawing.Size(341, 23);
+            this.RemarkTextBox.TabIndex = 1;
+            this.RemarkTextBox.TextChanged += new System.EventHandler(this.RemarkTextBox_TextChanged);
             // 
-            // ControlButton
+            // FilenameLabel
             // 
-            this.ControlButton.Location = new System.Drawing.Point(277, 362);
-            this.ControlButton.Name = "ControlButton";
-            this.ControlButton.Size = new System.Drawing.Size(75, 23);
-            this.ControlButton.TabIndex = 1;
-            this.ControlButton.Text = "Save";
-            this.ControlButton.UseVisualStyleBackColor = true;
-            this.ControlButton.Click += new System.EventHandler(this.ControlButton_Click);
+            this.FilenameLabel.AutoSize = true;
+            this.FilenameLabel.Location = new System.Drawing.Point(12, 55);
+            this.FilenameLabel.Name = "FilenameLabel";
+            this.FilenameLabel.Size = new System.Drawing.Size(59, 17);
+            this.FilenameLabel.TabIndex = 2;
+            this.FilenameLabel.Text = "Filename";
             // 
-            // DeleteToolStripMenuItem
+            // FilenameTextBox
             // 
-            this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem";
-            this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-            this.DeleteToolStripMenuItem.Text = "Delete";
-            this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.deleteRule_Click);
+            this.FilenameTextBox.Location = new System.Drawing.Point(84, 52);
+            this.FilenameTextBox.Name = "FilenameTextBox";
+            this.FilenameTextBox.ReadOnly = true;
+            this.FilenameTextBox.Size = new System.Drawing.Size(341, 23);
+            this.FilenameTextBox.TabIndex = 3;
             // 
             // containerControl1
             // 
-            this.containerControl1.Controls.Add(this.RuleListBox);
-            this.containerControl1.Location = new System.Drawing.Point(6, 100);
+            this.containerControl1.Controls.Add(this.RuleRichTextBox);
+            this.containerControl1.Location = new System.Drawing.Point(6, 81);
             this.containerControl1.Name = "containerControl1";
-            this.containerControl1.Size = new System.Drawing.Size(328, 157);
-            this.containerControl1.TabIndex = 10;
-            this.containerControl1.Padding = new Padding(0);
+            this.containerControl1.Size = new System.Drawing.Size(419, 221);
+            this.containerControl1.TabIndex = 4;
             this.containerControl1.Text = "containerControl1";
             // 
+            // RuleRichTextBox
+            // 
+            this.RuleRichTextBox.DetectUrls = false;
+            this.RuleRichTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RuleRichTextBox.Location = new System.Drawing.Point(0, 0);
+            this.RuleRichTextBox.Name = "RuleRichTextBox";
+            this.RuleRichTextBox.Size = new System.Drawing.Size(419, 221);
+            this.RuleRichTextBox.TabIndex = 0;
+            this.RuleRichTextBox.Text = "";
+            this.RuleRichTextBox.WordWrap = false;
+            // 
+            // ProcessGroupBox
+            // 
+            this.ProcessGroupBox.Controls.Add(this.SelectButton);
+            this.ProcessGroupBox.Controls.Add(this.ScanButton);
+            this.ProcessGroupBox.Controls.Add(this.ValidationButton);
+            this.ProcessGroupBox.Location = new System.Drawing.Point(6, 295);
+            this.ProcessGroupBox.Name = "ProcessGroupBox";
+            this.ProcessGroupBox.Size = new System.Drawing.Size(419, 44);
+            this.ProcessGroupBox.TabIndex = 5;
+            this.ProcessGroupBox.TabStop = false;
+            // 
+            // SelectButton
+            // 
+            this.SelectButton.Location = new System.Drawing.Point(6, 13);
+            this.SelectButton.Name = "SelectButton";
+            this.SelectButton.Size = new System.Drawing.Size(75, 23);
+            this.SelectButton.TabIndex = 0;
+            this.SelectButton.Text = "Select";
+            this.SelectButton.UseVisualStyleBackColor = true;
+            this.SelectButton.Click += new System.EventHandler(this.SelectButton_Click);
+            // 
+            // ScanButton
+            // 
+            this.ScanButton.Location = new System.Drawing.Point(87, 13);
+            this.ScanButton.Name = "ScanButton";
+            this.ScanButton.Size = new System.Drawing.Size(75, 23);
+            this.ScanButton.TabIndex = 1;
+            this.ScanButton.Text = "Scan";
+            this.ScanButton.UseVisualStyleBackColor = true;
+            this.ScanButton.Click += new System.EventHandler(this.ScanButton_Click);
+            // 
+            // ValidationButton
+            // 
+            this.ValidationButton.Location = new System.Drawing.Point(338, 13);
+            this.ValidationButton.Name = "ValidationButton";
+            this.ValidationButton.Size = new System.Drawing.Size(75, 23);
+            this.ValidationButton.TabIndex = 2;
+            this.ValidationButton.Text = "Validation";
+            this.ValidationButton.UseVisualStyleBackColor = true;
+            this.ValidationButton.Click += new System.EventHandler(this.ValidationButton_Click);
+            // 
+            // ControlButton
+            // 
+            this.ControlButton.Location = new System.Drawing.Point(344, 345);
+            this.ControlButton.Name = "ControlButton";
+            this.ControlButton.Size = new System.Drawing.Size(75, 23);
+            this.ControlButton.TabIndex = 6;
+            this.ControlButton.Text = "Save";
+            this.ControlButton.UseVisualStyleBackColor = true;
+            this.ControlButton.Click += new System.EventHandler(this.ControlButton_Click);
+            // 
             // Process
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(364, 397);
-            this.Controls.Add(this.ControlButton);
+            this.ClientSize = new System.Drawing.Size(455, 388);
             this.Controls.Add(this.ConfigurationGroupBox);
-            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (134)));
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.MaximizeBox = false;
             this.Name = "Process";
+            this.Padding = new System.Windows.Forms.Padding(12, 5, 12, 5);
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Create Process Mode";
             this.Load += new System.EventHandler(this.ModeForm_Load);
             this.ConfigurationGroupBox.ResumeLayout(false);
             this.ConfigurationGroupBox.PerformLayout();
-            this.ProcessGroupBox.ResumeLayout(false);
-            this.ProcessGroupBox.PerformLayout();
-            this.contextMenuStrip.ResumeLayout(false);
             this.containerControl1.ResumeLayout(false);
+            this.ProcessGroupBox.ResumeLayout(false);
             this.ResumeLayout(false);
+
         }
 
         #endregion
 
+        private System.Windows.Forms.Button ScanButton;
         private System.Windows.Forms.ContainerControl containerControl1;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
-        private System.Windows.Forms.ToolStripMenuItem DeleteToolStripMenuItem;
         public System.Windows.Forms.GroupBox ConfigurationGroupBox;
         private System.Windows.Forms.Label RemarkLabel;
         private System.Windows.Forms.GroupBox ProcessGroupBox;
-        private System.Windows.Forms.ListBox RuleListBox;
         private System.Windows.Forms.TextBox RemarkTextBox;
-        private System.Windows.Forms.TextBox ProcessNameTextBox;
-        private System.Windows.Forms.Button AddButton;
-        private System.Windows.Forms.Button ScanButton;
+        private System.Windows.Forms.Button SelectButton;
         public System.Windows.Forms.Button ControlButton;
         private System.Windows.Forms.Label FilenameLabel;
         private System.Windows.Forms.TextBox FilenameTextBox;
-        private System.Windows.Forms.CheckBox UseCustomFilenameBox;
+        private RichTextBox RuleRichTextBox;
+        private Button ValidationButton;
     }
 }

Netch/Forms/Mode/Process.cs

@@ -1,10 +1,11 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using Netch.Controllers;
+using Netch.Models;
 using Netch.Properties;
 using Netch.Utils;
 
@@ -31,103 +32,48 @@ namespace Netch.Forms.Mode
             CheckForIllegalCrossThreadCalls = false;
 
             _mode = mode;
-            if (mode != null)
+        }
+
+        #region Model
+
+        public IEnumerable<string> Rules => RuleRichTextBox.Lines;
+
+        private void RuleAdd(string value)
+        {
+            RuleRichTextBox.AppendText($"{value}\n");
+        }
+
+        private void RuleAddRange(IEnumerable<string> value)
+        {
+            foreach (string s in value)
+            {
+                RuleAdd(s);
+            }
+        }
+
+        #endregion
+
+        public void ModeForm_Load(object sender, EventArgs e)
+        {
+            if (_mode != null)
             {
                 Text = "Edit Process Mode";
 
                 RemarkTextBox.TextChanged -= RemarkTextBox_TextChanged;
-                FilenameTextBox.Enabled = UseCustomFilenameBox.Enabled = false;
-
-                RemarkTextBox.Text = mode.Remark;
-                FilenameTextBox.Text = mode.RelativePath;
-                RuleListBox.Items.AddRange(mode.Rule.ToArray());
+                RemarkTextBox.Text = _mode.Remark;
+                FilenameTextBox.Text = _mode.RelativePath;
+                RuleAddRange(_mode.Rule);
             }
-        }
 
-        /// <summary>
-        ///     是否被编辑过
-        /// </summary>
-        public bool Edited { get; private set; }
-
-        /// <summary>
-        ///     扫描目录
-        /// </summary>
-        /// <param name="DirName">路径</param>
-        public void ScanDirectory(string DirName)
-        {
-            try
-            {
-                RuleListBox.Items.AddRange(Directory.GetFiles(DirName, "*.exe", SearchOption.AllDirectories)
-                    .Select(f => Path.GetFileName(f))
-                    .ToArray());
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
-        }
-
-        public void ModeForm_Load(object sender, EventArgs e)
-        {
             i18N.TranslateForm(this);
-            i18N.Translate(contextMenuStrip);
         }
 
-        /// <summary>
-        ///     listBox右键菜单
-        /// </summary>
-        private void RuleListBox_MouseUp(object sender, MouseEventArgs e)
-        {
-            RuleListBox.SelectedIndex = RuleListBox.IndexFromPoint(e.X, e.Y);
-            if (RuleListBox.SelectedIndex == -1)
-                return;
-
-            if (e.Button == MouseButtons.Right)
-                contextMenuStrip.Show(RuleListBox, e.Location);
-        }
-
-        private void deleteRule_Click(object sender, EventArgs e)
-        {
-            if (RuleListBox.SelectedIndex == -1)
-                return;
-
-            RuleListBox.Items.RemoveAt(RuleListBox.SelectedIndex);
-            Edited = true;
-        }
-
-        private async void AddButton_Click(object sender, EventArgs e)
-        {
-            await Task.Run(() =>
-            {
-                if (string.IsNullOrWhiteSpace(ProcessNameTextBox.Text))
-                {
-                    MessageBoxX.Show(i18N.Translate("Please enter an process name (xxx.exe)"));
-                    return;
-                }
-
-                if (!NFController.CheckCppRegex(ProcessNameTextBox.Text))
-                {
-                    MessageBoxX.Show("Rule does not conform to C++ regular expression syntax");
-                    return;
-                }
-
-                var process = ProcessNameTextBox.Text;
-
-                if (!RuleListBox.Items.Contains(process))
-                    RuleListBox.Items.Add(process);
-
-                Edited = true;
-                RuleListBox.SelectedIndex = RuleListBox.Items.IndexOf(process);
-                ProcessNameTextBox.Text = string.Empty;
-            });
-        }
-
-        private void ScanButton_Click(object sender, EventArgs e)
+        private void SelectButton_Click(object sender, EventArgs e)
         {
             var dialog = new CommonOpenFileDialog
             {
                 IsFolderPicker = true,
-                Multiselect = false,
+                Multiselect = true,
                 Title = i18N.Translate("Select a folder"),
                 AddToMostRecentlyUsedList = false,
                 EnsurePathExists = true,
@@ -136,14 +82,20 @@ namespace Netch.Forms.Mode
 
             if (dialog.ShowDialog(Handle) == CommonFileDialogResult.Ok)
             {
-                ScanDirectory(dialog.FileName);
-                MessageBoxX.Show(i18N.Translate("Scan completed"));
+                foreach (string p in dialog.FileNames)
+                {
+                    string path = p;
+                    if (!path.EndsWith(@"\"))
+                        path += @"\";
+
+                    RuleAdd($"^{path.ToRegexString()}");
+                }
             }
         }
 
         public void ControlButton_Click(object sender, EventArgs e)
         {
-            if (RuleListBox.Items.Count == 0)
+            if (!RuleRichTextBox.Lines.Any())
             {
                 MessageBoxX.Show(i18N.Translate("Unable to add empty rule"));
                 return;
@@ -165,16 +117,14 @@ namespace Netch.Forms.Mode
             {
                 _mode.Remark = RemarkTextBox.Text;
                 _mode.Rule.Clear();
-                _mode.Rule.AddRange(RuleListBox.Items.Cast<string>());
+                _mode.Rule.AddRange(RuleRichTextBox.Lines);
 
                 _mode.WriteFile();
-                Global.MainForm.LoadModes();
-                Edited = false;
                 MessageBoxX.Show(i18N.Translate("Mode updated successfully"));
             }
             else
             {
-                var relativePath = $"Custom\\{FilenameTextBox.Text}.txt";
+                var relativePath = FilenameTextBox.Text;
                 var fullName = ModeHelper.GetFullPath(relativePath);
                 if (File.Exists(fullName))
                 {
@@ -184,30 +134,78 @@ namespace Netch.Forms.Mode
 
                 var mode = new Models.Mode(fullName)
                 {
-                    BypassChina = false,
                     Type = 0,
                     Remark = RemarkTextBox.Text
                 };
 
-                mode.Rule.AddRange(RuleListBox.Items.Cast<string>());
+                mode.Rule.AddRange(RuleRichTextBox.Lines);
 
                 mode.WriteFile();
-                ModeHelper.Add(mode);
                 MessageBoxX.Show(i18N.Translate("Mode added successfully"));
             }
 
             Close();
         }
 
-        private async void RemarkTextBox_TextChanged(object sender, EventArgs e)
+        private void RemarkTextBox_TextChanged(object? sender, EventArgs? e)
         {
-            await Task.Run(() =>
+            BeginInvoke(new Action(() =>
             {
-                if (!UseCustomFilenameBox.Checked)
+                FilenameTextBox.Text = FilenameTextBox.Text = ModeEditorUtils.GetCustomModeRelativePath(RemarkTextBox.Text);
+            }));
+        }
+
+        private void ScanButton_Click(object sender, EventArgs e)
+        {
+            var dialog = new CommonOpenFileDialog
+            {
+                IsFolderPicker = true,
+                Multiselect = false,
+                Title = i18N.Translate("Select a folder"),
+                AddToMostRecentlyUsedList = false,
+                EnsurePathExists = true,
+                NavigateToShortcut = true
+            };
+
+            if (dialog.ShowDialog(Handle) == CommonFileDialogResult.Ok)
+            {
+                var path = dialog.FileName;
+                var list = new List<string>();
+                const uint maxCount = 50;
+                try
                 {
-                    FilenameTextBox.Text = ModeEditorUtils.ToSafeFileName(RemarkTextBox.Text);
+                    ScanDirectory(path, list);
                 }
-            });
+                catch
+                {
+                    MessageBoxX.Show(i18N.Translate($"The number of executable files in the \"{path}\" directory is greater than {maxCount}"),
+                        LogLevel.WARNING);
+
+                    return;
+                }
+
+                RuleAddRange(list);
+            }
+        }
+
+        private void ScanDirectory(string directory, List<string> list, uint maxCount = 30)
+        {
+            foreach (string dir in Directory.GetDirectories(directory))
+                ScanDirectory(dir, list, maxCount);
+
+            list.AddRange(
+                Directory.GetFiles(directory).Select(s => Path.GetFileName(s)).Where(s => s.EndsWith(".exe")).Select(s => s.ToRegexString()));
+
+            if (maxCount != 0 && list.Count > maxCount)
+                throw new Exception("The number of results is greater than maxCount");
+        }
+
+        private void ValidationButton_Click(object sender, EventArgs e)
+        {
+            if (!NFController.CheckRules(Rules, out var results))
+                MessageBoxX.Show(NFController.GenerateInvalidRulesMessage(results), LogLevel.WARNING);
+            else
+                MessageBoxX.Show("Fine");
         }
     }
 }

Netch/Forms/Mode/Process.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Netch/Forms/Mode/Route.Designer.cs

@@ -35,7 +35,6 @@ namespace Netch.Forms.Mode
             this.components = new System.ComponentModel.Container();
             this.ConfigurationGroupBox = new System.Windows.Forms.GroupBox();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.UseCustomFilenameBox = new System.Windows.Forms.CheckBox();
             this.FilenameLabel = new System.Windows.Forms.Label();
             this.FilenameTextBox = new System.Windows.Forms.TextBox();
             this.ActionLabel = new System.Windows.Forms.Label();
@@ -54,7 +53,6 @@ namespace Netch.Forms.Mode
             // ConfigurationGroupBox
             // 
             this.ConfigurationGroupBox.Controls.Add(this.comboBox1);
-            this.ConfigurationGroupBox.Controls.Add(this.UseCustomFilenameBox);
             this.ConfigurationGroupBox.Controls.Add(this.FilenameLabel);
             this.ConfigurationGroupBox.Controls.Add(this.FilenameTextBox);
             this.ConfigurationGroupBox.Controls.Add(this.ActionLabel);
@@ -74,34 +72,24 @@ namespace Netch.Forms.Mode
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.Location = new System.Drawing.Point(84, 49);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(138, 20);
+            this.comboBox1.Size = new System.Drawing.Size(138, 25);
             this.comboBox1.TabIndex = 11;
             // 
-            // UseCustomFilenameBox
-            // 
-            this.UseCustomFilenameBox.AutoSize = true;
-            this.UseCustomFilenameBox.Location = new System.Drawing.Point(84, 100);
-            this.UseCustomFilenameBox.Name = "UseCustomFilenameBox";
-            this.UseCustomFilenameBox.Size = new System.Drawing.Size(138, 16);
-            this.UseCustomFilenameBox.TabIndex = 9;
-            this.UseCustomFilenameBox.Text = "Use Custom Filename";
-            this.UseCustomFilenameBox.UseVisualStyleBackColor = true;
-            // 
             // FilenameLabel
             // 
             this.FilenameLabel.AutoSize = true;
             this.FilenameLabel.Location = new System.Drawing.Point(12, 79);
             this.FilenameLabel.Name = "FilenameLabel";
-            this.FilenameLabel.Size = new System.Drawing.Size(53, 12);
+            this.FilenameLabel.Size = new System.Drawing.Size(59, 17);
             this.FilenameLabel.TabIndex = 6;
             this.FilenameLabel.Text = "Filename";
             // 
             // FilenameTextBox
             // 
-            this.FilenameTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.UseCustomFilenameBox, "Checked", true));
             this.FilenameTextBox.Location = new System.Drawing.Point(84, 76);
             this.FilenameTextBox.Name = "FilenameTextBox";
-            this.FilenameTextBox.Size = new System.Drawing.Size(250, 21);
+            this.FilenameTextBox.ReadOnly = true;
+            this.FilenameTextBox.Size = new System.Drawing.Size(250, 23);
             this.FilenameTextBox.TabIndex = 5;
             // 
             // ActionLabel
@@ -109,7 +97,7 @@ namespace Netch.Forms.Mode
             this.ActionLabel.AutoSize = true;
             this.ActionLabel.Location = new System.Drawing.Point(12, 52);
             this.ActionLabel.Name = "ActionLabel";
-            this.ActionLabel.Size = new System.Drawing.Size(41, 12);
+            this.ActionLabel.Size = new System.Drawing.Size(44, 17);
             this.ActionLabel.TabIndex = 0;
             this.ActionLabel.Text = "Action";
             // 
@@ -117,7 +105,7 @@ namespace Netch.Forms.Mode
             // 
             this.RemarkTextBox.Location = new System.Drawing.Point(84, 22);
             this.RemarkTextBox.Name = "RemarkTextBox";
-            this.RemarkTextBox.Size = new System.Drawing.Size(250, 21);
+            this.RemarkTextBox.Size = new System.Drawing.Size(250, 23);
             this.RemarkTextBox.TabIndex = 1;
             this.RemarkTextBox.TextChanged += new System.EventHandler(this.RemarkTextBox_TextChanged);
             // 
@@ -126,16 +114,16 @@ namespace Netch.Forms.Mode
             this.RemarkLabel.AutoSize = true;
             this.RemarkLabel.Location = new System.Drawing.Point(12, 25);
             this.RemarkLabel.Name = "RemarkLabel";
-            this.RemarkLabel.Size = new System.Drawing.Size(41, 12);
+            this.RemarkLabel.Size = new System.Drawing.Size(53, 17);
             this.RemarkLabel.TabIndex = 0;
             this.RemarkLabel.Text = "Remark";
             // 
             // containerControl1
             // 
             this.containerControl1.Controls.Add(this.richTextBox1);
-            this.containerControl1.Location = new System.Drawing.Point(6, 125);
+            this.containerControl1.Location = new System.Drawing.Point(6, 103);
             this.containerControl1.Name = "containerControl1";
-            this.containerControl1.Size = new System.Drawing.Size(328, 224);
+            this.containerControl1.Size = new System.Drawing.Size(328, 246);
             this.containerControl1.TabIndex = 10;
             this.containerControl1.Text = "containerControl1";
             // 
@@ -144,13 +132,14 @@ namespace Netch.Forms.Mode
             this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.richTextBox1.Location = new System.Drawing.Point(0, 0);
             this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(328, 224);
+            this.richTextBox1.Size = new System.Drawing.Size(328, 246);
             this.richTextBox1.TabIndex = 0;
             this.richTextBox1.Text = "";
             // 
             // contextMenuStrip
             // 
-            this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.DeleteToolStripMenuItem});
+            this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.DeleteToolStripMenuItem});
             this.contextMenuStrip.Name = "contextMenuStrip";
             this.contextMenuStrip.Size = new System.Drawing.Size(114, 26);
             // 
@@ -172,7 +161,7 @@ namespace Netch.Forms.Mode
             // 
             // Route
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(356, 419);
             this.Controls.Add(this.ConfigurationGroupBox);
@@ -186,6 +175,7 @@ namespace Netch.Forms.Mode
             this.containerControl1.ResumeLayout(false);
             this.contextMenuStrip.ResumeLayout(false);
             this.ResumeLayout(false);
+
         }
 
         public System.Windows.Forms.GroupBox ConfigurationGroupBox;
@@ -198,7 +188,6 @@ namespace Netch.Forms.Mode
         private System.Windows.Forms.Label RemarkLabel;
         private System.Windows.Forms.TextBox RemarkTextBox;
         private System.Windows.Forms.RichTextBox richTextBox1;
-        private System.Windows.Forms.CheckBox UseCustomFilenameBox;
 
         #endregion
 

Netch/Forms/Mode/Route.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows.Forms;
+using Netch.Models;
 using Netch.Properties;
 using Netch.Utils;
 
@@ -9,26 +9,7 @@ namespace Netch.Forms.Mode
 {
     public partial class Route : Form
     {
-        class Item
-        {
-            private string _text;
-
-            public Item(int value, string text)
-            {
-                _text = text;
-                Value = value;
-            }
-
-            public string Text
-            {
-                get => i18N.Translate(_text);
-                set => _text = value;
-            }
-
-            public int Value { get; set; }
-        }
-
-        private readonly Item[] _items = {new(1, "Proxy Rule IPs"), new(2, "Bypass Rule IPs")};
+        private readonly TagItem<int>[] _items = {new(1, "Proxy Rule IPs"), new(2, "Bypass Rule IPs")};
 
         private readonly Models.Mode? _mode;
 
@@ -42,10 +23,8 @@ namespace Netch.Forms.Mode
             InitializeComponent();
             Icon = Resources.icon;
             comboBox1.DataSource = _items;
-            comboBox1.ValueMember = "Value";
-            comboBox1.DisplayMember = "Text";
-
-            i18N.TranslateForm(this);
+            comboBox1.ValueMember = nameof(TagItem<int>.Value);
+            comboBox1.DisplayMember = nameof(TagItem<int>.Text);
         }
 
         private void Route_Load(object sender, EventArgs e)
@@ -55,13 +34,13 @@ namespace Netch.Forms.Mode
                 Text = "Edit Route Table Rule";
 
                 RemarkTextBox.TextChanged -= RemarkTextBox_TextChanged;
-                FilenameTextBox.Enabled = UseCustomFilenameBox.Enabled = false;
-
                 RemarkTextBox.Text = _mode.Remark;
                 comboBox1.SelectedValue = _mode.Type; // ComboBox SelectedValue worked after ctor
                 FilenameTextBox.Text = _mode.RelativePath;
                 richTextBox1.Lines = _mode.Rule.ToArray();
             }
+
+            i18N.TranslateForm(this);
         }
 
         private void ControlButton_Click(object sender, EventArgs e)
@@ -86,12 +65,11 @@ namespace Netch.Forms.Mode
                 _mode.Type = (int) comboBox1.SelectedValue;
 
                 _mode.WriteFile();
-                Global.MainForm.LoadModes();
                 MessageBoxX.Show(i18N.Translate("Mode updated successfully"));
             }
             else
             {
-                var relativePath = $"Custom\\{FilenameTextBox.Text}.txt";
+                var relativePath = FilenameTextBox.Text;
                 var fullName = ModeHelper.GetFullPath(relativePath);
                 if (File.Exists(fullName))
                 {
@@ -108,22 +86,15 @@ namespace Netch.Forms.Mode
                 mode.Rule.AddRange(richTextBox1.Lines);
 
                 mode.WriteFile();
-                ModeHelper.Add(mode);
                 MessageBoxX.Show(i18N.Translate("Mode added successfully"));
             }
 
             Close();
         }
 
-        private async void RemarkTextBox_TextChanged(object sender, EventArgs e)
+        private void RemarkTextBox_TextChanged(object? sender, EventArgs? e)
         {
-            await Task.Run(() =>
-            {
-                if (!UseCustomFilenameBox.Checked)
-                {
-                    FilenameTextBox.Text = ModeEditorUtils.ToSafeFileName(RemarkTextBox.Text);
-                }
-            });
+            BeginInvoke(new Action(() => { FilenameTextBox.Text = ModeEditorUtils.GetCustomModeRelativePath(RemarkTextBox.Text); }));
         }
     }
 }

Netch/Forms/Mode/Route.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Netch/Forms/SettingForm.cs

@@ -4,8 +4,8 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using System.Windows.Forms;
+using Netch.Models;
 using Netch.Properties;
 using Netch.Utils;
 
@@ -26,25 +26,19 @@ namespace Netch.Forms
             #region General
 
             BindTextBox<ushort>(Socks5PortTextBox,
-                p => p.ToString() != HTTPPortTextBox.Text && p.ToString() != RedirectorTextBox.Text,
+                p => p.ToString() != HTTPPortTextBox.Text,
                 p => Global.Settings.Socks5LocalPort = p,
                 Global.Settings.Socks5LocalPort);
 
             BindTextBox<ushort>(HTTPPortTextBox,
-                p => p.ToString() != Socks5PortTextBox.Text && p.ToString() != RedirectorTextBox.Text,
+                p => p.ToString() != Socks5PortTextBox.Text,
                 p => Global.Settings.HTTPLocalPort = p,
                 Global.Settings.HTTPLocalPort);
 
-            BindTextBox<ushort>(RedirectorTextBox,
-                p => p.ToString() != Socks5PortTextBox.Text && p.ToString() != HTTPPortTextBox.Text,
-                p => Global.Settings.RedirectorTCPPort = p,
-                Global.Settings.RedirectorTCPPort);
-
             BindCheckBox(AllowDevicesCheckBox,
                 c => Global.Settings.LocalAddress = AllowDevicesCheckBox.Checked ? "0.0.0.0" : "127.0.0.1",
                 Global.Settings.LocalAddress switch {"127.0.0.1" => false, "0.0.0.0" => true, _ => false});
 
-            BindCheckBox(BootShadowsocksFromDLLCheckBox, c => Global.Settings.BootShadowsocksFromDLL = c, Global.Settings.BootShadowsocksFromDLL);
             BindCheckBox(ResolveServerHostnameCheckBox, c => Global.Settings.ResolveServerHostname = c, Global.Settings.ResolveServerHostname);
 
             BindRadioBox(ICMPingRadioBtn, _ => { }, !Global.Settings.ServerTCPing);
@@ -98,27 +92,33 @@ namespace Netch.Forms
                 Global.Settings.STUN_Server + ":" + Global.Settings.STUN_Server_Port,
                 stuns);
 
-            BindTextBox<string>(AclAddrTextBox, s => true, s => Global.Settings.ACL = s, Global.Settings.ACL);
-
-            BindListComboBox(LanguageComboBox,
-                o => Global.Settings.Language = o.ToString(),
-                i18N.GetTranslateList().Cast<object>().ToArray(),
-                Global.Settings.Language);
+            BindListComboBox(LanguageComboBox, o => Global.Settings.Language = o.ToString(), i18N.GetTranslateList(), Global.Settings.Language);
 
             #endregion
 
             #region Process Mode
 
-            BindCheckBox(ModifySystemDNSCheckBox, b => Global.Settings.ModifySystemDNS = b, Global.Settings.ModifySystemDNS);
+            BindCheckBox(DNSHijackCheckBox, b => Global.Settings.Redirector.DNSHijack = b, Global.Settings.Redirector.DNSHijack);
 
-            BindTextBox(ModifiedDNSTextBox, s => DnsUtils.TrySplit(s, out _, 2), s => Global.Settings.ModifiedDNS = s, Global.Settings.ModifiedDNS);
+            BindTextBox(DNSHijackHostTextBox, s => true, s => Global.Settings.Redirector.DNSHijackHost = s, Global.Settings.Redirector.DNSHijackHost);
 
-            BindCheckBox(RedirectorSSCheckBox, s => Global.Settings.RedirectorSS = s, Global.Settings.RedirectorSS);
+            BindCheckBox(ICMPHijackCheckBox, b => Global.Settings.Redirector.ICMPHijack = b, Global.Settings.Redirector.ICMPHijack);
+
+            BindTextBox(ICMPHijackHostTextBox,
+                s => IPAddress.TryParse(s, out _),
+                s => Global.Settings.Redirector.ICMPHost = s,
+                Global.Settings.Redirector.ICMPHost);
+
+            BindCheckBox(RedirectorSSCheckBox, s => Global.Settings.Redirector.RedirectorSS = s, Global.Settings.Redirector.RedirectorSS);
+
+            BindCheckBox(ChildProcessHandleCheckBox,
+                s => Global.Settings.Redirector.ChildProcessHandle = s,
+                Global.Settings.Redirector.ChildProcessHandle);
 
             BindListComboBox(ProcessProxyProtocolComboBox,
-                s => Global.Settings.ProcessProxyProtocol = (PortType) Enum.Parse(typeof(PortType), s.ToString(), false),
-                Enum.GetNames(typeof(PortType)).Cast<object>().ToArray(),
-                Global.Settings.ProcessProxyProtocol.ToString());
+                s => Global.Settings.Redirector.ProxyProtocol = (PortType) Enum.Parse(typeof(PortType), s.ToString(), false),
+                Enum.GetNames(typeof(PortType)),
+                Global.Settings.Redirector.ProxyProtocol.ToString());
 
             #endregion
 
@@ -142,16 +142,15 @@ namespace Netch.Forms
             BindCheckBox(UseCustomDNSCheckBox, b => { Global.Settings.TUNTAP.UseCustomDNS = b; }, Global.Settings.TUNTAP.UseCustomDNS);
 
             BindTextBox(TUNTAPDNSTextBox,
-                s => !UseCustomDNSCheckBox.Checked || DnsUtils.TrySplit(s, out _, 2),
+                _ => true,
                 s =>
                 {
                     if (UseCustomDNSCheckBox.Checked)
-                        Global.Settings.TUNTAP.DNS = DnsUtils.Split(s).ToList();
+                        Global.Settings.TUNTAP.HijackDNS = s;
                 },
-                DnsUtils.Join(Global.Settings.TUNTAP.DNS));
+                Global.Settings.TUNTAP.HijackDNS);
 
             BindCheckBox(ProxyDNSCheckBox, b => Global.Settings.TUNTAP.ProxyDNS = b, Global.Settings.TUNTAP.ProxyDNS);
-            BindCheckBox(UseFakeDNSCheckBox, b => Global.Settings.TUNTAP.UseFakeDNS = b, Global.Settings.TUNTAP.UseFakeDNS);
 
             #endregion
 
@@ -212,17 +211,11 @@ namespace Netch.Forms
 
             #region AioDNS
 
-            BindTextBox(AioDNSRulePathTextBox, s => true, s => Global.Settings.AioDNS.RulePath = s, Global.Settings.AioDNS.RulePath);
+            BindTextBox(AioDNSRulePathTextBox, _ => true, s => Global.Settings.AioDNS.RulePath = s, Global.Settings.AioDNS.RulePath);
 
-            BindTextBox(ChinaDNSTextBox,
-                s => IPAddress.TryParse(s, out _),
-                s => Global.Settings.AioDNS.ChinaDNS = s,
-                Global.Settings.AioDNS.ChinaDNS);
+            BindTextBox(ChinaDNSTextBox, _ => true, s => Global.Settings.AioDNS.ChinaDNS = s, Global.Settings.AioDNS.ChinaDNS);
 
-            BindTextBox(OtherDNSTextBox,
-                s => IPAddress.TryParse(s, out _),
-                s => Global.Settings.AioDNS.OtherDNS = s,
-                Global.Settings.AioDNS.OtherDNS);
+            BindTextBox(OtherDNSTextBox, _ => true, s => Global.Settings.AioDNS.OtherDNS = s, Global.Settings.AioDNS.OtherDNS);
 
             #endregion
         }
@@ -230,13 +223,12 @@ namespace Netch.Forms
         private void SettingForm_Load(object sender, EventArgs e)
         {
             TUNTAPUseCustomDNSCheckBox_CheckedChanged(null, null);
-            Task.Run(() => BeginInvoke(new Action(() => UseFakeDNSCheckBox.Visible = Global.Flags.SupportFakeDns)));
         }
 
         private void TUNTAPUseCustomDNSCheckBox_CheckedChanged(object? sender, EventArgs? e)
         {
             if (UseCustomDNSCheckBox.Checked)
-                TUNTAPDNSTextBox.Text = Global.Settings.TUNTAP.DNS.Any() ? DnsUtils.Join(Global.Settings.TUNTAP.DNS) : "1.1.1.1";
+                TUNTAPDNSTextBox.Text = Global.Settings.TUNTAP.HijackDNS;
             else
                 TUNTAPDNSTextBox.Text = "AioDNS";
         }
@@ -315,14 +307,19 @@ namespace Netch.Forms
             _saveActions.Add(control, c => save.Invoke(((RadioButton) c).Checked));
         }
 
-        private void BindListComboBox(ComboBox control, Action<object> save, object[] values, object value, string propertyName = "SelectedItem")
+        private void BindListComboBox<T>(ComboBox comboBox, Action<T> save, IEnumerable<T> values, T value) where T : notnull
         {
-            if (control.DropDownStyle != ComboBoxStyle.DropDownList)
+            if (comboBox.DropDownStyle != ComboBoxStyle.DropDownList)
                 throw new ArgumentOutOfRangeException();
 
-            control.Items.AddRange(values);
-            _saveActions.Add(control, c => save.Invoke(((ComboBox) c).SelectedItem));
-            Load += (_, _) => { control.SelectedItem = value; };
+            var tagItems = values.Select(o => new TagItem<T>(o, o.ToString()!)).ToArray();
+            comboBox.Items.AddRange(tagItems.Cast<object>().ToArray());
+
+            comboBox.ValueMember = nameof(TagItem<T>.Value);
+            comboBox.DisplayMember = nameof(TagItem<T>.Text);
+
+            _saveActions.Add(comboBox, c => save.Invoke(((TagItem<T>) ((ComboBox) c).SelectedItem).Value));
+            Load += (_, _) => { comboBox.SelectedItem = tagItems.SingleOrDefault(t => t.Value.Equals(value)); };
         }
 
         private void BindComboBox(ComboBox control, Func<string, bool> check, Action<string> save, string value, object[]? values = null)

Netch/Forms/SettingForm.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Netch/Global.cs

@@ -2,10 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Threading;
 using System.Windows.Forms;
-using WindowsJobAPI;
-using Netch.Controllers;
 using Netch.Forms;
 using Netch.Models;
 
@@ -13,31 +10,11 @@ namespace Netch
 {
     public static class Global
     {
-        /// <summary>
-        ///     换行
-        /// </summary>
-        public const string EOF = "\r\n";
-
-        public const string UserACL = "data\\user.acl";
-        public const string BuiltinACL = "bin\\default.acl";
-
-        public static readonly string NetchDir = Application.StartupPath;
-
-        public static readonly string NetchExecutable = Application.ExecutablePath;
-
         /// <summary>
         ///     主窗体的静态实例
         /// </summary>
         private static readonly Lazy<MainForm> LazyMainForm = new(() => new MainForm());
 
-        public static readonly Mutex Mutex = new(false, "Global\\Netch");
-
-#if DEBUG
-        public static bool Testing = false;
-#else
-        public const bool Testing = false;
-#endif
-
         /// <summary>
         ///     用于读取和写入的配置
         /// </summary>
@@ -48,20 +25,6 @@ namespace Netch
         /// </summary>
         public static readonly List<Mode> Modes = new();
 
-        /// <summary>
-        ///     Windows Job API
-        /// </summary>
-        public static readonly JobObject Job = new();
-
-        public static class Flags
-        {
-            public static readonly bool IsWindows10Upper = Environment.OSVersion.Version.Major >= 10;
-
-            private static readonly Lazy<bool> LazySupportFakeDns = new(() => new TUNTAPController().TestFakeDNS());
-
-            public static bool SupportFakeDns => LazySupportFakeDns.Value;
-        }
-
         /// <summary>
         ///     主窗体的静态实例
         /// </summary>
@@ -73,5 +36,8 @@ namespace Netch
             IgnoreNullValues = true,
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
         };
+
+        public static readonly string NetchDir = Application.StartupPath;
+        public static readonly string NetchExecutable = Application.ExecutablePath;
     }
 }

Netch/Interops/AioDNSInterops.cs

@@ -0,0 +1,33 @@
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Netch.Interops
+{
+    public static class AioDNSInterops
+    {
+        private const string aiodns_bin = "aiodns.bin";
+
+        public static bool Dial(NameList name, string value)
+        {
+            return aiodns_dial(name, Encoding.UTF8.GetBytes(value));
+        }
+
+        [DllImport(aiodns_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool aiodns_dial(NameList name, byte[] value);
+
+        [DllImport(aiodns_bin, EntryPoint = "aiodns_init", CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool Init();
+
+        [DllImport(aiodns_bin, EntryPoint = "aiodns_free", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void Free();
+
+        public enum NameList
+        {
+            TYPE_REST,
+            TYPE_ADDR,
+            TYPE_LIST,
+            TYPE_CDNS,
+            TYPE_ODNS
+        }
+    }
+}

Netch/Interops/RedirectorInterop.cs

@@ -0,0 +1,79 @@
+using System.Runtime.InteropServices;
+using Netch.Utils;
+
+namespace Netch.Interops
+{
+    public static class RedirectorInterop
+    {
+        public enum NameList
+        {
+            TYPE_FILTERLOOPBACK,
+            TYPE_FILTERICMP,
+            TYPE_FILTERTCP,
+            TYPE_FILTERUDP,
+
+            TYPE_CLRNAME,
+            TYPE_ADDNAME,
+            TYPE_BYPNAME,
+
+            TYPE_DNSHOST,
+
+            TYPE_TCPLISN,
+            TYPE_TCPTYPE,
+            TYPE_TCPHOST,
+            TYPE_TCPUSER,
+            TYPE_TCPPASS,
+            TYPE_TCPMETH,
+            TYPE_TCPPROT,
+            TYPE_TCPPRPA,
+            TYPE_TCPOBFS,
+            TYPE_TCPOBPA,
+
+            TYPE_UDPLISN,
+            TYPE_UDPTYPE,
+            TYPE_UDPHOST,
+            TYPE_UDPUSER,
+            TYPE_UDPPASS,
+            TYPE_UDPMETH,
+            TYPE_UDPPROT,
+            TYPE_UDPPRPA,
+            TYPE_UDPOBFS,
+            TYPE_UDPOBPA
+        }
+
+        public static bool Dial(NameList name, string value)
+        {
+            Logging.Debug($"Dial {name} {value}");
+            return aio_dial(name, value);
+        }
+
+        public static bool Init()
+        {
+            return aio_init();
+        }
+
+        public static bool Free()
+        {
+            return aio_free();
+        }
+
+        public const int UdpNameListOffset = (int) NameList.TYPE_UDPLISN - (int) NameList.TYPE_TCPLISN;
+
+        private const string Redirector_bin = "Redirector.bin";
+
+        [DllImport(Redirector_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool aio_dial(NameList name, [MarshalAs(UnmanagedType.LPWStr)] string value);
+
+        [DllImport(Redirector_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool aio_init();
+
+        [DllImport(Redirector_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool aio_free();
+
+        [DllImport(Redirector_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern ulong aio_getUP();
+
+        [DllImport(Redirector_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern ulong aio_getDL();
+    }
+}

Netch/Interops/TUNInterop.cs

@@ -0,0 +1,73 @@
+using System.Runtime.InteropServices;
+using System.Text;
+using Netch.Utils;
+
+namespace Netch.Interops
+{
+    public static class TUNInterop
+    {
+        public enum NameList
+        {
+            TYPE_BYPBIND,
+            TYPE_BYPLIST,
+            TYPE_DNSADDR,
+            TYPE_ADAPMTU,
+            TYPE_TCPREST,
+            TYPE_TCPTYPE,
+            TYPE_TCPHOST,
+            TYPE_TCPUSER,
+            TYPE_TCPPASS,
+            TYPE_TCPMETH,
+            TYPE_TCPPROT,
+            TYPE_TCPPRPA,
+            TYPE_TCPOBFS,
+            TYPE_TCPOBPA,
+            TYPE_UDPREST,
+            TYPE_UDPTYPE,
+            TYPE_UDPHOST,
+            TYPE_UDPUSER,
+            TYPE_UDPPASS,
+            TYPE_UDPMETH,
+            TYPE_UDPPROT,
+            TYPE_UDPPRPA,
+            TYPE_UDPOBFS,
+            TYPE_UDPOBPA
+        }
+
+        public static bool Dial(NameList name, string value)
+        {
+            Logging.Debug($"Dial {name} {value}");
+            return tun_dial(name, Encoding.UTF8.GetBytes(value));
+        }
+
+        public static bool Init()
+        {
+            return tun_init();
+        }
+
+        public static bool Free()
+        {
+            return tun_free();
+        }
+
+        private const string tun2socks_bin = "tun2socks.bin";
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool tun_dial(NameList name, byte[] value);
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool tun_init();
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern bool tun_free();
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        public static extern ulong tun_luid();
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern ulong tun_getUP();
+
+        [DllImport(tun2socks_bin, CallingConvention = CallingConvention.Cdecl)]
+        private static extern ulong tun_getDL();
+    }
+}

Netch/Models/GitHubRelease/SuffixVersion.cs

@@ -1,54 +1,31 @@
 using System;
-using System.Text;
+using System.Linq;
 
 namespace Netch.Models.GitHubRelease
 {
     [Serializable]
-    public struct SuffixVersion : ICloneable, IComparable, IComparable<SuffixVersion>, IEquatable<SuffixVersion>
+    public struct SuffixVersion : IComparable, IComparable<SuffixVersion>
     {
-        public int Major { get; }
+        public Version Version { get; }
 
-        public int Minor { get; }
+        public string Suffix { get; }
 
-        public int Patch { get; }
-
-        public string PreRelease { get; }
-
-        public int Build { get; }
-
-        public SuffixVersion(int major, int minor, int patch, string preRelease, int build)
+        public SuffixVersion(Version version, string suffix)
         {
-            Major = major;
-            Minor = minor;
-            Patch = patch;
-            PreRelease = preRelease;
-            Build = build;
+            Version = version;
+            Suffix = suffix;
         }
 
-        public SuffixVersion(Version version, string preRelease, int build)
+        public static SuffixVersion Parse(string? input)
         {
-            Major = version.Major;
-            Minor = version.Minor;
-            Patch = version.Build;
-            PreRelease = preRelease;
-            Build = build;
-        }
+            if (input == null)
+                throw new ArgumentNullException(nameof(input));
 
-        public static SuffixVersion Parse(string input)
-        {
-            var splitStr = input.Split('-');
-            var dotNetVersion = Version.Parse(splitStr[0]);
-            var preRelease = new StringBuilder();
-            var build = 0;
+            var split = input.Split('-');
+            var dotNetVersion = Version.Parse(split[0]);
+            var preRelease = split.ElementAtOrDefault(1) ?? string.Empty;
 
-            if (splitStr.Length > 1)
-                foreach (var c in splitStr[1])
-                    if (int.TryParse(c.ToString(), out var n))
-                        build = build * 10 + n;
-                    else
-                        preRelease.Append(c);
-
-            return new SuffixVersion(dotNetVersion, preRelease.ToString(), build);
+            return new SuffixVersion(dotNetVersion, preRelease);
         }
 
         public static bool TryParse(string input, out SuffixVersion result)
@@ -65,17 +42,12 @@ namespace Netch.Models.GitHubRelease
             }
         }
 
-        public object Clone()
+        public int CompareTo(object? obj)
         {
-            return new SuffixVersion(Major, Major, Patch, PreRelease, Build);
-        }
+            if (obj is not SuffixVersion version)
+                throw new ArgumentOutOfRangeException();
 
-        public int CompareTo(object obj)
-        {
-            if (obj is SuffixVersion version)
-                return CompareTo(version);
-
-            return -1;
+            return CompareTo(version);
         }
 
         /// <summary>
@@ -86,57 +58,27 @@ namespace Netch.Models.GitHubRelease
         /// </returns>
         public int CompareTo(SuffixVersion other)
         {
-            var majorComparison = Major.CompareTo(other.Major);
-            if (majorComparison != 0)
-                return majorComparison;
+            var versionComparison = Version.CompareTo(other.Version);
+            if (versionComparison != 0)
+                return versionComparison;
 
-            var minorComparison = Minor.CompareTo(other.Minor);
-            if (minorComparison != 0)
-                return minorComparison;
+            if (Suffix == string.Empty)
+                return other.Suffix == string.Empty ? 0 : 1;
 
-            var patchComparison = Patch.CompareTo(other.Patch);
-            if (patchComparison != 0)
-                return patchComparison;
-
-            if (PreRelease == string.Empty)
-                return other.PreRelease == string.Empty ? 0 : 1;
-
-            if (other.PreRelease == string.Empty)
+            if (other.Suffix == string.Empty)
                 return -1;
 
-            var suffixComparison = string.Compare(PreRelease, other.PreRelease, StringComparison.Ordinal);
-            if (suffixComparison != 0)
-                return suffixComparison;
-
-            return Build.CompareTo(other.Build);
-        }
-
-        public bool Equals(SuffixVersion other)
-        {
-            return Major == other.Major && Minor == other.Minor && Patch == other.Patch && PreRelease == other.PreRelease && Build == other.Build;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is SuffixVersion other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = Major;
-                hashCode = (hashCode * 397) ^ Minor;
-                hashCode = (hashCode * 397) ^ Patch;
-                hashCode = (hashCode * 397) ^ (PreRelease != null ? PreRelease.GetHashCode() : 0);
-                hashCode = (hashCode * 397) ^ Build;
-                return hashCode;
-            }
+            var suffixComparison = string.Compare(Suffix, other.Suffix, StringComparison.OrdinalIgnoreCase);
+            return suffixComparison;
         }
 
         public override string ToString()
         {
-            return $"{Major}.{Minor}.{Patch}{(string.IsNullOrEmpty(PreRelease) ? "" : "-")}{PreRelease}{(Build == 0 ? "" : Build.ToString())}";
+            var s = Version.ToString();
+            if (Suffix != string.Empty)
+                s += $"-{Suffix}";
+
+            return s;
         }
     }
 }

Netch/Models/GitHubRelease/VersionComparer.cs

@@ -1,11 +1,18 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Netch.Models.GitHubRelease
 {
     public class VersionComparer : IComparer<object>
     {
-        public int Compare(object x, object y)
+        public int Compare(object? x, object? y)
         {
+            if (x == null)
+                throw new ArgumentNullException(nameof(x));
+
+            if (y == null)
+                throw new ArgumentNullException(nameof(y));
+
             return VersionUtil.CompareVersion(x.ToString(), y.ToString());
         }
     }

Netch/Models/GitHubRelease/VersionUtil.cs

@@ -23,7 +23,7 @@ namespace Netch.Models.GitHubRelease
         /// <returns> =0:versions are equal</returns>
         /// <returns> &gt;0:version1 is greater</returns>
         /// <returns> &lt;0:version2 is greater</returns>
-        public static int CompareVersion(string v1, string v2)
+        public static int CompareVersion(string? v1, string? v2)
         {
             var version1 = SuffixVersion.Parse(v1);
             var version2 = SuffixVersion.Parse(v2);

Netch/Models/IAdapter.cs

@@ -3,13 +3,12 @@ using System.Net.NetworkInformation;
 
 namespace Netch.Models
 {
-    public interface  IAdapter
+    public interface IAdapter
     {
-        public abstract int Index { get; }
+        int InterfaceIndex { get; }
 
-        public abstract IPAddress Gateway { get; }
-
-        public abstract NetworkInterface NetworkInterface { get; }
+        IPAddress Gateway { get; }
 
+        NetworkInterface NetworkInterface { get; }
     }
 }

Netch/Models/LogLevel.cs

@@ -4,6 +4,7 @@ namespace Netch.Models
     {
         INFO,
         WARNING,
-        ERROR
+        ERROR,
+        DEBUG
     }
 }

Netch/Models/MessageException.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Netch.Models
+{
+    public class MessageException : Exception
+    {
+        public MessageException()
+        {
+        }
+
+        public MessageException(string message) : base(message)
+        {
+        }
+    }
+}

Netch/Models/Mode.cs

@@ -9,17 +9,39 @@ namespace Netch.Models
 {
     public class Mode
     {
-        public readonly string? FullName;
+        private readonly Lazy<List<string>> _lazyRule;
+
+        public string? FullName { get; private set; }
+
+        public Mode(string? fullName)
+        {
+            _lazyRule = new Lazy<List<string>>(ReadRules);
+            if (fullName == null)
+                return;
+
+            FullName = fullName;
+            if (!File.Exists(FullName))
+                return;
+
+            var text = File.ReadLines(FullName).First();
+
+            // load head
+            if (text.First() != '#')
+                throw new Exception($"mode {FullName} head not found at Line 0");
+
+            var split = text.Substring(1).SplitTrimEntries(',');
+            Remark = split[0];
+
+            var typeResult = int.TryParse(split.ElementAtOrDefault(1), out var type);
+            Type = typeResult ? type : 0;
+            if (!ModeHelper.ModeTypes.Contains(Type))
+                throw new NotSupportedException($"not support mode \"[{Type}]{Remark}\".");
+        }
 
         /// <summary>
         ///     规则
         /// </summary>
-        public readonly List<string> Rule = new();
-
-        /// <summary>
-        ///     绕过中国（0. 不绕过 1. 绕过）
-        /// </summary>
-        public bool BypassChina { get; set; }
+        public List<string> Rule => _lazyRule.Value;
 
         /// <summary>
         ///     备注
@@ -44,15 +66,6 @@ namespace Netch.Models
         /// </summary>
         public int Type { get; set; } = 0;
 
-        public Mode(string fullName)
-        {
-            FullName = fullName;
-        }
-
-        public Mode()
-        {
-        }
-
         /// <summary>
         ///     文件相对路径(必须是存在的文件)
         /// </summary>
@@ -78,30 +91,21 @@ namespace Netch.Models
                         relativePath.Replace(">", "");
                         relativePath.Replace(".h", ".txt");
 
-                        var mode = Global.Modes.FirstOrDefault(m => m!.FullName != null && m.RelativePath!.Equals(relativePath.ToString()));
+                        var mode = Global.Modes.FirstOrDefault(m => m.FullName != null && m.RelativePath!.Equals(relativePath.ToString()));
 
                         if (mode == null)
-                        {
-                            Logging.Warning($"{relativePath} file included in {Remark} not found");
-                        }
-                        else if (mode == this)
-                        {
-                            Logging.Warning("Can't self-reference");
-                        }
-                        else
-                        {
-                            if (mode.Type != Type)
-                            {
-                                Logging.Warning($"{mode.Remark}'s mode is not as same as {Remark}'s mode");
-                            }
-                            else
-                            {
-                                if (mode.Rule.Any(rule => rule.StartsWith("#include")))
-                                    Logging.Warning("Cannot reference mode that reference other mode");
-                                else
-                                    result.AddRange(mode.FullRule);
-                            }
-                        }
+                            throw new MessageException($"{relativePath} file included in {Remark} not found");
+
+                        if (mode == this)
+                            throw new MessageException("Can't self-reference");
+
+                        if (mode.Type != Type)
+                            throw new MessageException($"{mode.Remark}'s mode is not as same as {Remark}'s mode");
+
+                        if (mode.Rule.Any(rule => rule.StartsWith("#include")))
+                            throw new Exception("Cannot reference mode that reference other mode");
+
+                        result.AddRange(mode.FullRule);
                     }
                     else
                     {
@@ -113,6 +117,14 @@ namespace Netch.Models
             }
         }
 
+        private List<string> ReadRules()
+        {
+            if (FullName == null || !File.Exists(FullName))
+                return new List<string>();
+
+            return File.ReadLines(FullName!).Skip(1).ToList();
+        }
+
         public void WriteFile(string? fullName = null)
         {
             if (fullName != null)
@@ -141,7 +153,7 @@ namespace Netch.Models
         /// <returns>模式文件字符串</returns>
         public string ToFileString()
         {
-            return $"# {Remark}, {Type}, {(BypassChina ? 1 : 0)}{Global.EOF}{string.Join(Global.EOF, Rule)}";
+            return $"# {Remark}, {Type}{Constants.EOF}{string.Join(Constants.EOF, Rule)}";
         }
     }
 
@@ -152,11 +164,5 @@ namespace Netch.Models
         {
             return mode.Type is 0 or 2;
         }
-
-        /// Socks5 分流是否能被有效实施
-        public static bool ClientRouting(this Mode mode)
-        {
-            return mode.Type is not (1 or 2);
-        }
     }
 }

Netch/Models/OutboundAdapter.cs

@@ -2,8 +2,6 @@
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
-using Microsoft.Win32;
-using Netch.Controllers;
 using Netch.Utils;
 using Vanara.PInvoke;
 
@@ -11,7 +9,7 @@ namespace Netch.Models
 {
     public class OutboundAdapter : IAdapter
     {
-        public OutboundAdapter(bool logging = true)
+        public OutboundAdapter()
         {
             // 寻找出口适配器
             if (IpHlpApi.GetBestRoute(BitConverter.ToUInt32(IPAddress.Parse("114.114.114.114").GetAddressBytes(), 0), 0, out var pRoute) != 0)
@@ -23,22 +21,20 @@ namespace Netch.Models
                 .First(ni => ni.Supports(NetworkInterfaceComponent.IPv4) &&
                              ni.GetIPProperties().GetIPv4Properties().Index == pRoute.dwForwardIfIndex);
 
-            Index = (int) pRoute.dwForwardIfIndex;
+            Address = new IPAddress(pRoute.dwForwardNextHop.S_addr);
+            InterfaceIndex = (int) pRoute.dwForwardIfIndex;
             Gateway = new IPAddress(pRoute.dwForwardNextHop.S_un_b);
-            _parametersRegistry =
-                Registry.LocalMachine.OpenSubKey($@"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\{NetworkInterface.Id}", true)!;
 
-            if (logging)
-            {
-                Logging.Info($"出口 网关 地址：{Gateway}");
-                Logging.Info($"出口适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {Index}");
-            }
+            Logging.Info($"出口 网关 地址：{Gateway}");
+            Logging.Info($"出口适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
         }
 
+        public IPAddress Address { get; }
+
         /// <summary>
         ///     索引
         /// </summary>
-        public int Index { get; }
+        public int InterfaceIndex { get; }
 
         /// <summary>
         ///     网关
@@ -46,24 +42,5 @@ namespace Netch.Models
         public IPAddress Gateway { get; }
 
         public NetworkInterface NetworkInterface { get; }
-
-
-        public string DNS
-        {
-            get
-            {
-                try
-                {
-                    return (string) _parametersRegistry.GetValue("NameServer");
-                }
-                catch
-                {
-                    return string.Empty;
-                }
-            }
-            set => _parametersRegistry.SetValue("NameServer", value, RegistryValueKind.String);
-        }
-
-        private readonly RegistryKey _parametersRegistry;
     }
 }

Netch/Models/ParameterBase.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Netch.Utils;
+
+namespace Netch.Models
+{
+    public abstract class ParameterBase
+    {
+        //     null value par
+
+        private readonly bool _full;
+
+        protected readonly string ParametersSeparate = " ";
+        protected readonly string Separate = " ";
+        protected readonly string VerbPrefix = "-";
+        protected readonly string FullPrefix = "--";
+
+        protected ParameterBase()
+        {
+            _full = !GetType().IsDefined(typeof(VerbAttribute));
+        }
+
+        public override string ToString()
+        {
+            var parameters = GetType().GetProperties().Select(PropToParameter).Where(s => s != null).Cast<string>();
+            return string.Join(ParametersSeparate, parameters).Trim();
+        }
+
+        private string? PropToParameter(PropertyInfo p)
+        {
+            // prefix
+            bool full;
+            if (p.IsDefined(typeof(VerbAttribute)))
+                full = false;
+            else if (p.IsDefined(typeof(FullAttribute)))
+                full = true;
+            else
+                full = _full;
+
+            var prefix = full ? FullPrefix : VerbPrefix;
+            // key
+            var key = p.GetCustomAttribute<RealNameAttribute>()?.Name ?? p.Name;
+
+            // build
+            var value = p.GetValue(this);
+            switch (value)
+            {
+                case bool b:
+                    return b ? $"{prefix}{key}" : null;
+                default:
+                    if ((value?.ToString() ?? null).IsNullOrWhiteSpace())
+                        return p.IsDefined(typeof(OptionalAttribute)) ? null : throw new RequiredArgumentValueInvalidException(p.Name, this, null);
+
+                    if (p.IsDefined(typeof(QuoteAttribute)))
+                        value = $"\"{value}\"";
+
+                    return $"{prefix}{key}{Separate}{value}";
+            }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
+    public class VerbAttribute : Attribute
+    {
+        // Don't use verb and full both on one class or property
+        // if you did, will take verb
+    }
+
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
+    public class FullAttribute : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Property)]
+    public class OptionalAttribute : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Property)]
+    public class QuoteAttribute : Attribute
+    {
+    }
+
+    [AttributeUsage(AttributeTargets.Property)]
+    public class RealNameAttribute : Attribute
+    {
+        public string Name { get; }
+
+        public RealNameAttribute(string name)
+        {
+            Name = name;
+        }
+    }
+
+    [Serializable]
+    public class RequiredArgumentValueInvalidException : Exception
+    {
+        public string? ArgumentName { get; }
+
+        public object? ArgumentObject { get; }
+
+        private readonly string? _message;
+
+        private const string DefaultMessage = "{0}'s Argument \"{1}\" value invalid. A required argument's value can't be null or empty.";
+
+        public override string Message => _message ?? string.Format(DefaultMessage, ArgumentObject!.GetType(), ArgumentName);
+
+        public RequiredArgumentValueInvalidException()
+        {
+            _message = "Some Argument value invalid. A required argument value's can't be null or empty.";
+        }
+
+        public RequiredArgumentValueInvalidException(string argumentName, object argumentObject, string? message)
+        {
+            ArgumentName = argumentName;
+            ArgumentObject = argumentObject;
+            _message = message;
+        }
+    }
+}

Netch/Models/Setting.cs

@@ -6,7 +6,7 @@ namespace Netch.Models
     /// <summary>
     ///     TUN/TAP 适配器配置类
     /// </summary>
-    public class TUNTAPConfig
+    public class TUNConfig
     {
         /// <summary>
         ///     地址
@@ -16,7 +16,7 @@ namespace Netch.Models
         /// <summary>
         ///     DNS
         /// </summary>
-        public List<string> DNS { get; set; } = new();
+        public string HijackDNS { get; set; } = "tcp://1.1.1.1:53";
 
         /// <summary>
         ///     网关
@@ -36,12 +36,12 @@ namespace Netch.Models
         /// <summary>
         ///     使用自定义 DNS 设置
         /// </summary>
-        public bool UseCustomDNS { get; set; } = false;
+        public bool UseCustomDNS { get; set; } = true;
 
         /// <summary>
-        ///     使用Fake DNS
+        ///     全局绕过 IP 列表
         /// </summary>
-        public bool UseFakeDNS { get; set; } = false;
+        public List<string> BypassIPs { get; set; } = new();
     }
 
     public class KcpConfig
@@ -76,13 +76,45 @@ namespace Netch.Models
 
     public class AioDNSConfig
     {
-        public string ChinaDNS { get; set; } = "223.5.5.5";
+        public string ChinaDNS { get; set; } = "tcp://223.5.5.5:53";
 
-        public string OtherDNS { get; set; } = "1.1.1.1";
+        public string OtherDNS { get; set; } = "tcp://1.1.1.1:53";
 
-        public string Protocol { get; set; } = "tcp";
+        public ushort ListenPort { get; set; } = 53;
 
-        public string RulePath { get; set; } = "bin\\china_site_list";
+        public string RulePath { get; set; } = "bin\\aiodns.conf";
+    }
+
+    public class RedirectorConfig
+    {
+        /// <summary>
+        ///     不代理TCP
+        /// </summary>
+        public PortType ProxyProtocol { get; set; } = PortType.Both;
+
+        /// <summary>
+        ///     是否开启DNS转发
+        /// </summary>
+        public bool DNSHijack { get; set; } = true;
+
+        /// <summary>
+        ///     转发DNS地址
+        /// </summary>
+        public string DNSHijackHost { get; set; } = "1.1.1.1:53";
+
+        public string ICMPHost { get; set; } = "1.2.4.8";
+
+        public bool ICMPHijack { get; set; } = false;
+
+        /// <summary>
+        ///     是否使用RDR内置SS
+        /// </summary>
+        public bool RedirectorSS { get; set; } = false;
+
+        /// <summary>
+        ///     是否代理子进程
+        /// </summary>
+        public bool ChildProcessHandle { get; set; } = false;
     }
 
     /// <summary>
@@ -90,28 +122,15 @@ namespace Netch.Models
     /// </summary>
     public class Setting
     {
+        public RedirectorConfig Redirector { get; set; } = new();
+
         /// <summary>
         ///     服务器列表
         /// </summary>
         public List<Server> Server { get; set; } = new();
 
-        /// <summary>
-        ///     ACL规则
-        /// </summary>
-        public string ACL { get; set; } = "https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/banAD.acl";
-
         public AioDNSConfig AioDNS { get; set; } = new();
 
-        /// <summary>
-        ///     是否使用DLL启动Shadowsocks
-        /// </summary>
-        public bool BootShadowsocksFromDLL { get; set; } = true;
-
-        /// <summary>
-        ///     全局绕过 IP 列表
-        /// </summary>
-        public List<string> BypassIPs { get; set; } = new();
-
         /// <summary>
         ///     是否检查 Beta 更新
         /// </summary>
@@ -155,32 +174,7 @@ namespace Netch.Models
         /// <summary>
         ///     模式选择位置
         /// </summary>
-        public int ModeComboBoxSelectedIndex { get; set; } = 0;
-
-        /// <summary>
-        ///     要修改为的系统 DNS
-        /// </summary>
-        public string ModifiedDNS { get; set; } = "1.1.1.1,8.8.8.8";
-
-        /// <summary>
-        ///     修改系统 DNS
-        /// </summary>
-        public bool ModifySystemDNS { get; set; } = false;
-
-        /// <summary>
-        ///     GFWList
-        /// </summary>
-        public string PAC { get; set; } = "https://raw.githubusercontent.com/HMBSbige/Text_Translation/master/ShadowsocksR/ss_white.pac";
-
-        /// <summary>
-        ///     PAC端口
-        /// </summary>
-        public ushort Pac_Port { get; set; } = 2803;
-
-        /// <summary>
-        ///     不代理TCP
-        /// </summary>
-        public PortType ProcessProxyProtocol { get; set; } = PortType.Both;
+        public int ModeComboBoxSelectedIndex { get; set; } = -1;
 
         /// <summary>
         ///     快捷配置数量
@@ -197,16 +191,6 @@ namespace Netch.Models
         /// </summary>
         public byte ProfileTableColumnCount { get; set; } = 5;
 
-        /// <summary>
-        ///     是否使用RDR内置SS
-        /// </summary>
-        public bool RedirectorSS { get; set; } = false;
-
-        /// <summary>
-        ///     Redirector TCP 占用端口
-        /// </summary>
-        public ushort RedirectorTCPPort { get; set; } = 3901;
-
         /// <summary>
         ///     网页请求超时 毫秒
         /// </summary>
@@ -215,7 +199,7 @@ namespace Netch.Models
         /// <summary>
         ///     解析服务器主机名
         /// </summary>
-        public bool ResolveServerHostname { get; set; } = false;
+        public bool ResolveServerHostname { get; set; } = true;
 
         /// <summary>
         ///     是否开机启动软件
@@ -225,7 +209,7 @@ namespace Netch.Models
         /// <summary>
         ///     服务器选择位置
         /// </summary>
-        public int ServerComboBoxSelectedIndex { get; set; } = 0;
+        public int ServerComboBoxSelectedIndex { get; set; } = -1;
 
         /// <summary>
         ///     服务器测试方式 false.ICMPing true.TCPing
@@ -270,30 +254,24 @@ namespace Netch.Models
         /// <summary>
         ///     TUNTAP 适配器配置
         /// </summary>
-        public TUNTAPConfig TUNTAP { get; set; } = new();
-
-        /// <summary>
-        ///     UDP Socket 占用端口
-        /// </summary>
-        public ushort UDPSocketPort { get; set; } = 18291;
+        public TUNConfig TUNTAP { get; set; } = new();
 
         /// <summary>
         ///     是否打开软件时更新订阅
         /// </summary>
         public bool UpdateServersWhenOpened { get; set; } = false;
 
-        /// <summary>
-        ///     使用代理更新订阅
-        /// </summary>
-        public bool UseProxyToUpdateSubscription { get; set; } = false;
-
         public V2rayConfig V2RayConfig { get; set; } = new();
 
-        public bool? AlwaysStartPACServer { get; set; }
-
         public Setting Clone()
         {
             return (Setting) MemberwiseClone();
         }
+
+        public void Set(Setting value)
+        {
+            foreach (var p in typeof(Setting).GetProperties())
+                p.SetValue(this, p.GetValue(value));
+        }
     }
 }

Netch/Models/TagItem.cs

@@ -0,0 +1,19 @@
+using Netch.Utils;
+
+namespace Netch.Models
+{
+    internal class TagItem<T>
+    {
+        private readonly string _text;
+
+        public TagItem(T value, string text)
+        {
+            _text = text;
+            Value = value;
+        }
+
+        public string Text => i18N.Translate(_text);
+
+        public T Value { get; }
+    }
+}

Netch/Models/TapAdapter.cs

@@ -1,30 +0,0 @@
-using System.Linq;
-using System.Net;
-using System.Net.NetworkInformation;
-using Netch.Controllers;
-using Netch.Utils;
-
-namespace Netch.Models
-{
-    public class TapAdapter : IAdapter
-    {
-        public TapAdapter()
-        {
-            Index = -1;
-            ComponentID = TUNTAP.GetComponentID() ?? throw new MessageException("TAP 适配器未安装");
-
-            // 根据 ComponentID 寻找 Tap适配器
-            NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.Id == ComponentID);
-            Index = NetworkInterface.GetIPProperties().GetIPv4Properties().Index;
-            Logging.Info($"TAP 适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {Index}");
-        }
-
-        public string ComponentID { get; }
-
-        public int Index { get; }
-
-        public IPAddress Gateway => IPAddress.Parse(Global.Settings.TUNTAP.Gateway);
-
-        public NetworkInterface NetworkInterface { get; }
-    }
-}

Netch/Models/TunAdapter.cs

@@ -0,0 +1,27 @@
+using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
+using Netch.Interops;
+using Netch.Utils;
+
+namespace Netch.Models
+{
+    public class TunAdapter : IAdapter
+    {
+        public TunAdapter()
+        {
+            InterfaceIndex = (int) NativeMethods.ConvertLuidToIndex(TUNInterop.tun_luid());
+            NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.GetIPProperties().GetIPv4Properties().Index == InterfaceIndex);
+            Gateway = IPAddress.Parse(Global.Settings.TUNTAP.Gateway);
+
+            Logging.Info($"WinTUN 适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
+        }
+
+
+        public int InterfaceIndex { get; }
+
+        public IPAddress Gateway { get; }
+
+        public NetworkInterface NetworkInterface { get; }
+    }
+}

Netch/NativeMethods.cs

@@ -4,9 +4,21 @@ namespace Netch
 {
     public static class NativeMethods
     {
+        /// <summary>
+        ///     分配 IP 地址
+        /// </summary>
+        /// <param name="inet">AF_INET / AF_INET6</param>
+        /// <param name="address">目标地址</param>
+        /// <param name="cidr">CIDR</param>
+        /// <param name="index">适配器索引</param>
+        /// <returns>是否成功</returns>
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl, EntryPoint = "CreateUnicastIP")]
+        public static extern bool CreateUnicastIP(int inet, string address, int cidr, int index);
+
         /// <summary>
         ///     创建路由规则
         /// </summary>
+        /// <param name="inet">AF_INET / AF_INET6</param>
         /// <param name="address">目标地址</param>
         /// <param name="cidr">CIDR</param>
         /// <param name="gateway">网关地址</param>
@@ -14,11 +26,12 @@ namespace Netch
         /// <param name="metric">跃点数</param>
         /// <returns>是否成功</returns>
         [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl, EntryPoint = "CreateRoute")]
-        public static extern bool CreateRoute(string address, int cidr, string gateway, int index, int metric = 0);
+        public static extern bool CreateRoute(int inet, string address, int cidr, string gateway, int index, int metric = 0);
 
         /// <summary>
         ///     删除路由规则
         /// </summary>
+        /// <param name="inet">AF_INET / AF_INET6</param>
         /// <param name="address">目标地址</param>
         /// <param name="cidr">掩码地址</param>
         /// <param name="gateway">网关地址</param>
@@ -26,15 +39,12 @@ namespace Netch
         /// <param name="metric">跃点数</param>
         /// <returns>是否成功</returns>
         [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl, EntryPoint = "DeleteRoute")]
-        public static extern bool DeleteRoute(string address, int cidr, string gateway, int index, int metric = 0);
+        public static extern bool DeleteRoute(int inet, string address, int cidr, string gateway, int index, int metric = 0);
+
+        [DllImport("RouteHelper.bin", CallingConvention = CallingConvention.Cdecl)]
+        public static extern ulong ConvertLuidToIndex(ulong luid);
 
         [DllImport("dnsapi", EntryPoint = "DnsFlushResolverCache")]
         public static extern uint FlushDNSResolverCache();
-
-        [DllImport("kernel32.dll")]
-        public static extern bool AllocConsole();
-
-        [DllImport("kernel32.dll")]
-        public static extern bool AttachConsole(int dwProcessId);
     }
 }

Netch/Netch.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -7,26 +8,35 @@ using System.Windows.Forms;
 using Netch.Controllers;
 using Netch.Forms;
 using Netch.Utils;
+using static Vanara.PInvoke.Kernel32;
 
 namespace Netch
 {
     public static class Netch
     {
+        public static readonly SingleInstance.SingleInstance SingleInstance = new($"Global\\{nameof(Netch)}");
+
         /// <summary>
         ///     应用程序的主入口点
         /// </summary>
         [STAThread]
         public static void Main(string[] args)
         {
-            if (args.Contains("-console"))
-                if (!NativeMethods.AttachConsole(-1))
-                    NativeMethods.AllocConsole();
+#if DEBUG
+            AttachAllocConsole();
+#else
+            if (args.Contains(Constants.Parameter.Console))
+                AttachAllocConsole();
+#endif
+
+            if (args.Contains(Constants.Parameter.ForceUpdate))
+                Flags.AlwaysShowNewVersionFound = true;
 
             // 设置当前目录
             Directory.SetCurrentDirectory(Global.NetchDir);
-            Environment.SetEnvironmentVariable("PATH",
-                Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) + ";" + Path.Combine(Global.NetchDir, "bin"),
-                EnvironmentVariableTarget.Process);
+            var binPath = Path.Combine(Global.NetchDir, "bin");
+            Environment.SetEnvironmentVariable("PATH", $"{Environment.GetEnvironmentVariable("PATH")};{binPath}");
+            AddDllDirectory(binPath);
 
             Updater.Updater.CleanOld(Global.NetchDir);
 
@@ -39,16 +49,16 @@ namespace Netch
             // 加载配置
             Configuration.Load();
 
-            // 检查是否已经运行
-            if (!Global.Mutex.WaitOne(0, false))
+            if (!SingleInstance.IsFirstInstance)
             {
-                OnlyInstance.Send(OnlyInstance.Commands.Show);
-                Logging.Info("唤起单实例");
-
-                // 退出进程
-                Environment.Exit(1);
+                SingleInstance.PassArgumentsToFirstInstance(args.Append(Constants.Parameter.Show));
+                Environment.Exit(0);
+                return;
             }
 
+            SingleInstance.ArgumentsReceived.Subscribe(SingleInstance_ArgumentsReceived);
+            SingleInstance.ListenForArgumentsFromSuccessiveInstances();
+
             // 清理上一次的日志文件，防止淤积占用磁盘空间
             if (Directory.Exists("logging"))
             {
@@ -72,25 +82,35 @@ namespace Netch
 
             Logging.Info($"版本: {UpdateChecker.Owner}/{UpdateChecker.Repo}@{UpdateChecker.Version}");
             Task.Run(() => { Logging.Info($"主程序 SHA256: {Utils.Utils.SHA256CheckSum(Global.NetchExecutable)}"); });
-            Task.Run(() =>
-            {
-                Logging.Info("启动单实例");
-                OnlyInstance.Server();
-            });
 
             // 绑定错误捕获
             Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
             Application.ThreadException += Application_OnException;
 
+            Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(Global.MainForm);
         }
 
+        private static void AttachAllocConsole()
+        {
+            if (!AttachConsole(ATTACH_PARENT_PROCESS))
+                AllocConsole();
+        }
+
         public static void Application_OnException(object sender, ThreadExceptionEventArgs e)
         {
             Logging.Error(e.Exception.ToString());
             Utils.Utils.Open(Logging.LogFile);
         }
+
+        private static void SingleInstance_ArgumentsReceived(IEnumerable<string> args)
+        {
+            if (args.Contains(Constants.Parameter.Show))
+            {
+                Global.MainForm.ShowMainFormToolStripButton_Click(null!, null!);
+            }
+        }
     }
 }

Netch/Netch.csproj

@@ -2,80 +2,68 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net48</TargetFramework>
         <UseWindowsForms>true</UseWindowsForms>
         <UseWPF>true</UseWPF>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <StartupObject>Netch.Netch</StartupObject>
         <ApplicationManifest>App.manifest</ApplicationManifest>
         <ApplicationIcon>Resources\Netch.ico</ApplicationIcon>
+        <IsPackable>false</IsPackable>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <EnableNETAnalyzers>false</EnableNETAnalyzers>
+        <AnalysisMode>Default</AnalysisMode>
+        <CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows</TargetFramework>
+        <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+        <Configurations>Debug;Release</Configurations>
         <Platforms>x64</Platforms>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <LangVersion>latest</LangVersion>
-        <IsPackable>false</IsPackable>
-        <Nullable>enable</Nullable>
+        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
         <OutputPath>bin\x64\Debug\</OutputPath>
         <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-        <NoWarn />
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <NoWarn />
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <WarningsAsErrors />
         <OutputPath>bin\x64\Release\</OutputPath>
         <DebugType>none</DebugType>
         <DebugSymbols>false</DebugSymbols>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Remove=".gitignore" />
-    </ItemGroup>
-
-    <ItemGroup>
+        <PackageReference Include="HMBSbige.SingleInstance" Version="5.0.0" />
         <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
         <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.66" GeneratePathProperty="true" />
-        <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-        <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
-        <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
-        <PackageReference Include="System.Text.Json" Version="5.0.1" />
+        <PackageReference Include="Nullable.Extended.Analyzer" Version="1.2.4089">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
         <PackageReference Include="TaskScheduler" Version="2.9.1" />
-        <PackageReference Include="Vanara.PInvoke.IpHlpApi" Version="3.3.5" />
+        <PackageReference Include="Vanara.PInvoke.IpHlpApi" Version="3.3.7" />
         <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
-        <PackageReference Include="Vanara.PInvoke.User32" Version="3.3.5" />
+        <PackageReference Include="Vanara.PInvoke.User32" Version="3.3.7" />
         <PackageReference Include="WindowsFirewallHelper" Version="2.0.4.70-beta2" />
-        <PackageReference Include="WindowsJobAPI" Version="5.0.1" />
-        <PackageReference Include="WindowsProxy" Version="5.0.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
-        <!--    .NET Framework    -->
-        <PackageReference Include="ILMerge" Version="3.0.41" />
-        <Reference Include="System.Management" />
-        <Reference Include="System.ServiceProcess" />
-        <Reference Include="System.Web" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' != 'net'">
-        <!--    .NET Core    -->
-        <PackageReference Include="System.Management" Version="5.0.0" />
         <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
         <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SearchComboBox\SearchComboBox.csproj" />
+        <ProjectReference Include="..\Interop.nfapinet\Interop.nfapinet.csproj" />
     </ItemGroup>
 
     <ItemGroup>
+        <None Remove=".gitignore" />
         <None Visible="false" Include="..\binaries\**" LinkBase="bin" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
+        <None Update="..\binaries\NTT.exe">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        </None>
         <None Remove="..\binaries\.git" />
         <None Visible="false" Include="..\translations\i18n\**" LinkBase="i18n" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
         <None Visible="false" Include="..\modes\mode\**" LinkBase="mode" CopyToPublishDirectory="PreserveNewest" CopyToOutputDirectory="PreserveNewest" />
@@ -92,9 +80,7 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Settings.settings</DependentUpon>
         </Compile>
-        <Compile Update="Forms\Mode\Route.cs">
-          <SubType>Form</SubType>
-        </Compile>
+        <Compile Update="Forms\Mode\Route.cs" />
     </ItemGroup>
 
     <ItemGroup>
@@ -102,7 +88,6 @@
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <EmbeddedResource Remove="Forms\LogForm.resx" />
     </ItemGroup>
 
     <ItemGroup>
@@ -111,14 +96,6 @@
             <LastGenOutput>Settings.Designer.cs</LastGenOutput>
         </None>
     </ItemGroup>
-    <ProjectExtensions>
-        <VisualStudio>
-            <UserProperties />
-        </VisualStudio>
-    </ProjectExtensions>
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Command="set TargetFramework=$(TargetFramework)&#xD;&#xA;set Configuration=$(Configuration)&#xD;&#xA;set ILMergeConsolePath=$(ILMergeConsolePath)&#xD;&#xA;set TargetDir=$(TargetDir)&#xD;&#xA;set SolutionDir=$(SolutionDir)&#xD;&#xA;$(ProjectDir)PostBuild.bat" />
-    </Target>
 
     <Target Condition="'$(PublishSingleFile)' == 'true'" AfterTargets="_ComputeFilesToBundle" Name="RemoveDupeAssemblies">
         <ItemGroup>

Netch/PostBuild.bat

@@ -1,20 +0,0 @@
-if %Configuration%==Release if %TargetFramework%==net48 (
-:: Merge dlls
-%ILMergeConsolePath% /wildcards /out:%TargetDir%Netch.exe ^
-/lib:"C:\Windows\Microsoft.NET\Framework64\v4.0.30319" ^
-/targetplatform:v4,"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8" ^
-%TargetDir%Netch.exe ^
-%TargetDir%*.dll
-
-DEL /f %TargetDir%*.dll >NUL 2>&1
-)
-
-if %Configuration%==Release (
-DEL /f %TargetDir%*.config >NUL 2>&1
-DEL /f %TargetDir%*.pdb >NUL 2>&1
-)
-
-RD /s /Q %TargetDir%x86 >NUL 2>&1
-RD /s /Q %TargetDir%de %TargetDir%es %TargetDir%fr %TargetDir%it %TargetDir%pl %TargetDir%ru %TargetDir%zh-CN >NUL 2>&1
-
-exit 0

Netch/Properties/Resources.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本: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 Netch.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
-    // 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", "4.0.0.0")]
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -33,7 +33,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] _7za {
             get {
@@ -71,17 +71,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] abp_js {
-            get {
-                object obj = ResourceManager.GetObject("abp_js", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap CopyLink {
             get {
@@ -91,17 +81,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] defaultTUNTAP {
-            get {
-                object obj = ResourceManager.GetObject("defaultTUNTAP", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap delete {
             get {
@@ -111,7 +91,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap edit {
             get {
@@ -121,7 +101,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        ///   查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Icon icon {
             get {
@@ -131,7 +111,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap Netch {
             get {
@@ -141,7 +121,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap speed {
             get {
@@ -151,7 +131,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap Sponsor {
             get {
@@ -161,7 +141,7 @@ namespace Netch.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] zh_CN {
             get {

Netch/Properties/Resources.resx

@@ -118,10 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="defaultTUNTAP" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\defaultTUNTAP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="zh_CN" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zh-CN;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b77a5c561934e089</value>
@@ -150,10 +146,6 @@
     <value>..\Resources\CopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\abp.js.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="7za" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\7za.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral,
 		    PublicKeyToken=b77a5c561934e089</value>

Netch/Resources/defaultTUNTAP

@@ -1,6 +0,0 @@
-[Generic]
-Address = 10.0.236.10
-Netmask = 255.255.255.0
-Gateway = 10.0.236.1
-DNS = 1.1.1.1
-UseCustomDNS = False

Netch/Resources/zh-CN

@@ -3,7 +3,6 @@
     "Information": "信息",
     "Error": "错误",
 
-    "If this is your first time using this software,\n please check https://netch.org to install supports first,\n or the program may report errors.": "如果你是第一次使用本软件，\n请务必前往 https://netch.org 安装程序所需依赖，\n否则程序将无法正常运行！",
     "Missing File or runtime components": "缺少文件或运行库",
     "Please extract all files then run the program!": "请先解压所有文件再执行程序！",
 
@@ -20,7 +19,6 @@
     "SetupBypass": "设置绕行规则",
     "Test failed": "测试失败",
     "Starting update subscription": "正在更新订阅",
-    "Starting update ACL": "正在更新 ACL",
     "Subscription updated": "订阅更新完毕",
     "Register driver": "正在注册驱动",
 
@@ -67,7 +65,6 @@
     "Subscribe": "订阅",
     "Manage Subscribe Links": "管理订阅链接",
     "Update Servers From Subscribe Links": "从订阅链接更新服务器",
-    "Update Servers From Subscribe Links With Proxy": "使用代理从订阅链接更新服务器",
     "No subscription link": "没有任何一条订阅链接",
     "Updating {0}": "正在更新 {0}",
     "Update {1} server(s) from {0}": "从 {0} 更新 {1} 个服务器",
@@ -85,21 +82,10 @@
     "Uninstall {0}": "卸载 {0}",
     "Uninstalling {0}": "正在卸载 {0} 中",
     "{0} has been uninstalled": "{0} 已卸载",
-    "Reload Modes": "重载模式",
-    "Modes have been reload": "模式已重载",
     "Clean DNS Cache": "清理 DNS 缓存",
     "DNS cache cleanup succeeded": "DNS 缓存清理成功",
     "Remove Netch Firewall Rules": "移除 Netch 防火墙规则",
 
-    "Update PAC": "更新 PAC",
-    "PAC updated successfully": "PAC 更新成功",
-    "PAC update failed": "PAC 更新失败",
-
-    "Update ACL": "更新 ACL 规则",
-    "Update ACL with proxy": "使用代理更新 ACL 规则",
-    "ACL updated successfully": "ACL 更新成功",
-    "ACL update failed": "ACL 更新失败",
-
     "Open Directory": "打开目录",
 
     "About": "关于",
@@ -155,22 +141,21 @@
     "Gateway": "网关",
     "Use Custom DNS": "使用自定义 DNS",
     "Proxy DNS in Proxy Rule IPs Mode": "在 代理规则IP 模式下代理 DNS",
-    "Use Fake DNS": "使用 Fake DNS",
     "Exit when closed": "关闭时退出",
     "Stop when exited": "退出时停止",
     "Global Bypass IPs": "全局直连 IP",
     "Check update when opened": "打开软件时检查更新",
     "Check Beta update": "检查 Beta 更新",
     "Update Servers when opened": "打开软件时更新服务器",
-    "SS DLL": "SS DLL",
-    "Modify System DNS": "修改系统 DNS",
     "Proxy Protocol": "代理协议",
+    "Handle process's DNS Hijack": "被代理进程 DNS 劫持",
+    "Global ICMP Hijack": "全局 ICMP 劫持",
+    "Child Process Handle": "子进程代理",
     "ProfileCount": "快捷配置数量",
     "Delay test after start": "启动后延迟测试",
     "ServerPingType": "测速方式",
     "Detection Tick(sec)": "检测心跳（秒）",
     "STUN Server": "STUN 服务器",
-    "Custom ACL": "自定义 ACL 规则",
     "Language": "语言",
     "Resolve Server Hostname": "解析服务器主机名",
     "FullCone Support (Required Server Xray-core v1.3.0+)": "FullCone 支持（需服务端 Xray-core v1.3.0+）",
@@ -183,12 +168,5 @@
     "Exit": "退出",
 
     "The {0} port is in use.": "{0} 端口已被占用",
-    "The {0} port is reserved by system.": "{0} 端口是系统保留端口",
-
-    "[Web Proxy] Bypass LAN": "[网页代理] 绕过局域网",
-    "[Non Web Proxy] Bypass LAN": "[不设置代理] 绕过局域网",
-    "[TUN/TAP] Bypass LAN": "[TUN/TAP] 绕过局域网",
-    "[Web Proxy] Bypass LAN and China": "[网页代理] 绕过局域网和中国大陆",
-    "[Non Web Proxy] Bypass LAN and China": "[不设置代理] 绕过局域网和中国大陆",
-    "[TUN/TAP] Bypass LAN and China": "[TUN/TAP] 绕过局域网和中国大陆"
+    "The {0} port is reserved by system.": "{0} 端口是系统保留端口"
 }

Netch/Servers/Shadowsocks/Form/ShadowsocksForm.cs

@@ -1,4 +1,5 @@
 using Netch.Forms;
+using Netch.Utils;
 
 namespace Netch.Servers.Shadowsocks.Form
 {
@@ -8,7 +9,7 @@ namespace Netch.Servers.Shadowsocks.Form
         {
             server ??= new Shadowsocks();
             Server = server;
-            CreateTextBox("Password", "Password", s => true, s => server.Password = s, server.Password);
+            CreateTextBox("Password", "Password", s => !s.IsNullOrWhiteSpace(), s => server.Password = s, server.Password);
             CreateComboBox("EncryptMethod", "Encrypt Method", SSGlobal.EncryptMethods, s => server.EncryptMethod = s, server.EncryptMethod);
             CreateTextBox("Plugin", "Plugin", s => true, s => server.Plugin = s, server.Plugin);
             CreateTextBox("PluginsOption", "Plugin Options", s => true, s => server.PluginOption = s, server.PluginOption);

Netch/Servers/Shadowsocks/SSController.cs

@@ -1,22 +1,16 @@
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
 using Netch.Controllers;
 using Netch.Models;
-using Netch.Utils;
 
 namespace Netch.Servers.Shadowsocks
 {
     public class SSController : Guard, IServerController
     {
-        public bool DllFlag;
-
         public override string MainFile { get; protected set; } = "Shadowsocks.exe";
 
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"listening at"};
+        protected override IEnumerable<string> StartedKeywords { get; set; } = new[] {"listening at"};
 
-        protected override IEnumerable<string> StoppedKeywords { get; } = new[] {"Invalid config path", "usage", "plugin service exit unexpectedly"};
+        protected override IEnumerable<string> StoppedKeywords { get; set; } = new[] {"Invalid config path", "usage", "plugin service exit unexpectedly"};
 
         public override string Name { get; } = "Shadowsocks";
 
@@ -28,70 +22,57 @@ namespace Netch.Servers.Shadowsocks
         {
             var server = (Shadowsocks) s;
 
-            DllFlag = Global.Settings.BootShadowsocksFromDLL && mode.Type is 0 or 1 or 2 && !server.HasPlugin();
-
-            //从DLL启动Shaowsocks
-            if (DllFlag)
+            var command = new SSParameter
             {
-                State = State.Starting;
-                var client = Encoding.UTF8.GetBytes($"{this.LocalAddress()}:{this.Socks5LocalPort()}");
-                var remote = Encoding.UTF8.GetBytes($"{server.AutoResolveHostname()}:{server.Port}");
-                var passwd = Encoding.UTF8.GetBytes($"{server.Password}");
-                var method = Encoding.UTF8.GetBytes($"{server.EncryptMethod}");
-                if (!ShadowsocksDLL.Info(client, remote, passwd, method))
-                {
-                    State = State.Stopped;
-                    throw new MessageException("DLL SS INFO 设置失败！");
-                }
+                s = server.AutoResolveHostname(),
+                p = server.Port,
+                b = this.LocalAddress(),
+                l = this.Socks5LocalPort(),
+                m = server.EncryptMethod,
+                k = server.Password,
+                u = true,
+                plugin = server.Plugin,
+                plugin_opts = server.PluginOption
+            };
 
-                Logging.Info("DLL SS INFO 设置成功！");
+            StartInstanceAuto(command.ToString());
+        }
 
-                if (!ShadowsocksDLL.Start())
-                {
-                    State = State.Stopped;
-                    throw new MessageException("DLL SS 启动失败！");
-                }
+        [Verb]
+        private class SSParameter : ParameterBase
+        {
+            public string? s { get; set; }
 
-                Logging.Info("DLL SS 启动成功！");
-                State = State.Started;
-                return;
-            }
+            public ushort? p { get; set; }
 
-            #region Argument
+            public string? b { get; set; }
 
-            var argument = new StringBuilder();
-            argument.Append($"-s {server.AutoResolveHostname()} " + $"-p {server.Port} " + $"-b {this.LocalAddress()} " +
-                            $"-l {this.Socks5LocalPort()} " + $"-m {server.EncryptMethod} " + $"-k \"{server.Password}\" " + "-u");
+            public ushort? l { get; set; }
 
-            if (!string.IsNullOrWhiteSpace(server.Plugin) && !string.IsNullOrWhiteSpace(server.PluginOption))
-                argument.Append($" --plugin {server.Plugin}" + $" --plugin-opts \"{server.PluginOption}\"");
+            public string? m { get; set; }
 
-            if (mode.BypassChina)
-                argument.Append($" --acl \"{Path.GetFullPath(File.Exists(Global.UserACL) ? Global.UserACL : Global.BuiltinACL)}\"");
+            public string? k { get; set; }
 
-            #endregion
+            public bool u { get; set; }
 
-            StartInstanceAuto(argument.ToString());
+            [Full]
+            [Optional]
+            public string? plugin { get; set; }
+
+            [Full]
+            [Optional]
+            [RealName("plugin-opts")]
+            public string? plugin_opts { get; set; }
+
+            [Full]
+            [Quote]
+            [Optional]
+            public string? acl { get; set; }
         }
 
         public override void Stop()
         {
-            if (DllFlag)
-                ShadowsocksDLL.Stop();
-            else
-                StopInstance();
-        }
-
-        private class ShadowsocksDLL
-        {
-            [DllImport("shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
-            public static extern bool Info(byte[] client, byte[] remote, byte[] passwd, byte[] method);
-
-            [DllImport("shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
-            public static extern bool Start();
-
-            [DllImport("shadowsocks-windows-dynamic", CallingConvention = CallingConvention.Cdecl)]
-            public static extern void Stop();
+            StopInstance();
         }
     }
 }

Netch/Servers/Shadowsocks/Shadowsocks.cs

@@ -15,7 +15,7 @@ namespace Netch.Servers.Shadowsocks
         /// <summary>
         ///     密码
         /// </summary>
-        public string? Password { get; set; }
+        public string Password { get; set; } = string.Empty;
 
         /// <summary>
         ///     插件

Netch/Servers/ShadowsocksR/Form/ShadowsocksRForm.cs

@@ -1,4 +1,5 @@
 using Netch.Forms;
+using Netch.Utils;
 
 namespace Netch.Servers.ShadowsocksR.Form
 {
@@ -8,7 +9,7 @@ namespace Netch.Servers.ShadowsocksR.Form
         {
             server ??= new ShadowsocksR();
             Server = server;
-            CreateTextBox("Password", "Password", s => true, s => server.Password = s, server.Password);
+            CreateTextBox("Password", "Password", s => !s.IsNullOrWhiteSpace(), s => server.Password = s, server.Password);
             CreateComboBox("EncryptMethod", "Encrypt Method", SSRGlobal.EncryptMethods, s => server.EncryptMethod = s, server.EncryptMethod);
             CreateComboBox("Protocol", "Protocol", SSRGlobal.Protocols, s => server.Protocol = s, server.Protocol);
             CreateTextBox("ProtocolParam", "Protocol Param", s => true, s => server.ProtocolParam = s, server.ProtocolParam);

Netch/Servers/ShadowsocksR/SSRController.cs

@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using Netch.Controllers;
 using Netch.Models;
 
@@ -10,9 +8,9 @@ namespace Netch.Servers.ShadowsocksR
     {
         public override string MainFile { get; protected set; } = "ShadowsocksR.exe";
 
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"listening at"};
+        protected override IEnumerable<string> StartedKeywords { get; set; } = new[] {"listening at"};
 
-        protected override IEnumerable<string> StoppedKeywords { get; } = new[] {"Invalid config path", "usage"};
+        protected override IEnumerable<string> StoppedKeywords { get; set; } = new[] {"Invalid config path", "usage"};
 
         public override string Name { get; } = "ShadowsocksR";
 
@@ -24,31 +22,61 @@ namespace Netch.Servers.ShadowsocksR
         {
             var server = (ShadowsocksR) s;
 
-            #region Argument
-
-            var argument = new StringBuilder();
-            argument.Append($"-s {server.AutoResolveHostname()} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120");
-            if (!string.IsNullOrEmpty(server.Protocol))
+            var command = new SSRParameter
             {
-                argument.Append($" -O {server.Protocol}");
-                if (!string.IsNullOrEmpty(server.ProtocolParam))
-                    argument.Append($" -G \"{server.ProtocolParam}\"");
-            }
+                s = server.AutoResolveHostname(),
+                p = server.Port,
+                k = server.Password,
+                m = server.EncryptMethod,
+                t = "120",
+                O = server.Protocol,
+                G = server.ProtocolParam,
+                o = server.OBFS,
+                g = server.OBFSParam,
+                b = this.LocalAddress(),
+                l = this.Socks5LocalPort(),
+                u = true
+            };
 
-            if (!string.IsNullOrEmpty(server.OBFS))
-            {
-                argument.Append($" -o {server.OBFS}");
-                if (!string.IsNullOrEmpty(server.OBFSParam))
-                    argument.Append($" -g \"{server.OBFSParam}\"");
-            }
+            StartInstanceAuto(command.ToString());
+        }
 
-            argument.Append($" -b {this.LocalAddress()} -l {this.Socks5LocalPort()} -u");
-            if (mode.BypassChina)
-                argument.Append($" --acl \"{Path.GetFullPath(File.Exists(Global.UserACL) ? Global.UserACL : Global.BuiltinACL)}\"");
+        [Verb]
+        class SSRParameter : ParameterBase
+        {
+            public string? s { get; set; }
 
-            #endregion
+            public ushort? p { get; set; }
 
-            StartInstanceAuto(argument.ToString());
+            [Quote]
+            public string? k { get; set; }
+
+            public string? m { get; set; }
+
+            public string? t { get; set; }
+
+            [Optional]
+            public string? O { get; set; }
+
+            [Optional]
+            public string? G { get; set; }
+
+            [Optional]
+            public string? o { get; set; }
+
+            [Optional]
+            public string? g { get; set; }
+
+            public string? b { get; set; }
+
+            public ushort? l { get; set; }
+
+            public bool u { get; set; }
+
+            [Full]
+            [Quote]
+            [Optional]
+            public string? acl { get; set; }
         }
 
         public override void Stop()

Netch/Servers/ShadowsocksR/SSRUtil.cs

@@ -40,7 +40,7 @@ namespace Netch.Servers.ShadowsocksR
             // https://github.com/shadowsocksr-backup/shadowsocks-rss/wiki/SSR-QRcode-scheme
             // ssr://base64(host:port:protocol:method:obfs:base64pass/?obfsparam=base64param&protoparam=base64param&remarks=base64remarks&group=base64group&udpport=0&uot=0)
             var paraStr =
-                $"/?obfsparam={ShareLink.URLSafeBase64Encode(server.OBFSParam)}&protoparam={ShareLink.URLSafeBase64Encode(server.ProtocolParam)}&remarks={ShareLink.URLSafeBase64Encode(server.Remark)}";
+                $"/?obfsparam={ShareLink.URLSafeBase64Encode(server.OBFSParam ?? "")}&protoparam={ShareLink.URLSafeBase64Encode(server.ProtocolParam ?? "")}&remarks={ShareLink.URLSafeBase64Encode(server.Remark)}";
 
             return "ssr://" +
                    ShareLink.URLSafeBase64Encode(

Netch/Servers/ShadowsocksR/ShadowsocksR.cs

@@ -7,26 +7,16 @@ namespace Netch.Servers.ShadowsocksR
     {
         public override string Type { get; } = "SSR";
 
-        /// <summary>
-        ///     加密方式
-        /// </summary>
-        public string EncryptMethod { get; set; } = SSRGlobal.EncryptMethods[0];
-
-        /// <summary>
-        ///     混淆
-        /// </summary>
-        public string OBFS { get; set; } = SSRGlobal.OBFSs[0];
-
-        /// <summary>
-        ///     混淆参数
-        /// </summary>
-        public string? OBFSParam { get; set; }
-
         /// <summary>
         ///     密码
         /// </summary>
         public string Password { get; set; } = string.Empty;
 
+        /// <summary>
+        ///     加密方式
+        /// </summary>
+        public string EncryptMethod { get; set; } = SSRGlobal.EncryptMethods[0];
+
         /// <summary>
         ///     协议
         /// </summary>
@@ -36,6 +26,16 @@ namespace Netch.Servers.ShadowsocksR
         ///     协议参数
         /// </summary>
         public string? ProtocolParam { get; set; }
+
+        /// <summary>
+        ///     混淆
+        /// </summary>
+        public string OBFS { get; set; } = SSRGlobal.OBFSs[0];
+
+        /// <summary>
+        ///     混淆参数
+        /// </summary>
+        public string? OBFSParam { get; set; }
     }
 
     public class SSRGlobal

Netch/Servers/Trojan/TrojanController.cs

@@ -11,9 +11,9 @@ namespace Netch.Servers.Trojan
     {
         public override string MainFile { get; protected set; } = "Trojan.exe";
 
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"started"};
+        protected override IEnumerable<string> StartedKeywords { get; set; } = new[] {"started"};
 
-        protected override IEnumerable<string> StoppedKeywords { get; } = new[] {"exiting"};
+        protected override IEnumerable<string> StoppedKeywords { get; set; } = new[] {"exiting"};
 
         public override string Name { get; } = "Trojan";
 

Netch/Servers/V2ray/Models/V2rayNSharing.cs

@@ -13,7 +13,7 @@
         /// <summary>
         ///     额外 ID
         /// </summary>
-        public string aid { get; set; } = string.Empty;
+        public int aid { get; set; }
 
         /// <summary>
         ///     伪装域名（HTTP，WS）
@@ -38,7 +38,7 @@
         /// <summary>
         ///     端口
         /// </summary>
-        public string port { get; set; } = string.Empty;
+        public ushort port { get; set; }
 
         /// <summary>
         ///     备注
@@ -58,6 +58,6 @@
         /// <summary>
         ///     链接版本
         /// </summary>
-        public string v { get; set; } = string.Empty;
+        public int v { get; set; } = 2;
     }
 }

Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs

@@ -65,25 +65,6 @@ namespace Netch.Servers.V2ray.Utils
                     outboundTag = "block"
                 };
 
-                if (mode.BypassChina)
-                    switch (mode.Type)
-                    {
-                        case 0:
-                            directRuleObject.ip.Add("geoip:cn");
-                            break;
-                        case 1:
-                        case 2:
-                            if (Global.Flags.SupportFakeDns && Global.Settings.TUNTAP.UseFakeDNS)
-                                directRuleObject.domain.Add("geosite:cn");
-                            else
-                                directRuleObject.ip.Add("geoip:cn");
-
-                            break;
-                        default:
-                            directRuleObject.domain.Add("geosite:cn");
-                            break;
-                    }
-
                 if (mode.Type is 0 or 1 or 2)
                     blockRuleObject.ip.Add("geoip:private");
 

Netch/Servers/V2ray/V2rayController.cs

@@ -10,9 +10,9 @@ namespace Netch.Servers.V2ray
     {
         public override string MainFile { get; protected set; } = "xray.exe";
 
-        protected override IEnumerable<string> StartedKeywords { get; } = new[] {"started"};
+        protected override IEnumerable<string> StartedKeywords { get; set; } = new[] {"started"};
 
-        protected override IEnumerable<string> StoppedKeywords { get; } = new[] {"config file not readable", "failed to"};
+        protected override IEnumerable<string> StoppedKeywords { get; set; } = new[] {"config file not readable", "failed to"};
 
         public override string Name { get; } = "Xray";
 

Netch/Servers/V2ray/V2rayUtils.cs

@@ -77,9 +77,7 @@ namespace Netch.Servers.V2ray
             var parameter = new Dictionary<string, string>();
             // protocol-specific fields
             parameter.Add("type", server.TransferProtocol);
-            if (server.EncryptMethod == "none")
-                // VLESS outbounds[].settings.encryption，当前可选值只有 none
-                parameter.Add("encryption", server.EncryptMethod);
+            parameter.Add("encryption", server.EncryptMethod);
 
             // transport-specific fields
             switch (server.TransferProtocol)

Netch/Servers/VMess/VMessUtil.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using Netch.Controllers;
 using Netch.Models;
 using Netch.Servers.V2ray;
@@ -43,12 +44,12 @@ namespace Netch.Servers.VMess
 
                 var vmessJson = JsonSerializer.Serialize(new V2rayNSharing
                     {
-                        v = "2",
+                        v = 2,
                         ps = server.Remark,
                         add = server.Hostname,
-                        port = server.Port.ToString(),
+                        port = server.Port,
                         id = server.UserID,
-                        aid = server.AlterID.ToString(),
+                        aid = server.AlterID,
                         net = server.TransferProtocol,
                         type = server.FakeType,
                         host = server.Host,
@@ -85,13 +86,14 @@ namespace Netch.Servers.VMess
                 return V2rayUtils.ParseVUri(text);
             }
 
-            V2rayNSharing vmess = JsonSerializer.Deserialize<V2rayNSharing>(s)!;
+            V2rayNSharing vmess = JsonSerializer.Deserialize<V2rayNSharing>(s,
+                new JsonSerializerOptions {NumberHandling = JsonNumberHandling.WriteAsString | JsonNumberHandling.AllowReadingFromString})!;
 
             data.Remark = vmess.ps;
             data.Hostname = vmess.add;
-            data.Port = ushort.Parse(vmess.port);
+            data.Port = vmess.port;
             data.UserID = vmess.id;
-            data.AlterID = int.Parse(vmess.aid);
+            data.AlterID = vmess.aid;
             data.TransferProtocol = vmess.net;
             data.FakeType = vmess.type;
 

Netch/Updater/Updater.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Netch.Controllers;
+using Netch.Models;
 using Netch.Properties;
 using Netch.Utils;
 
@@ -14,65 +15,168 @@ namespace Netch.Updater
 {
     public class Updater
     {
-        private static IEnumerable<string> _keepDirectory = new List<string>(new[] {"data", "mode\\Custom"});
-        private readonly string _targetPath;
-        private readonly string _tempFolder;
-        private readonly string _updateFilePath;
+        #region Download Update and apply update
 
-        private Updater(string updateFilePath, string targetPath)
+        /// <summary>
+        ///     Download Update and apply update (all arguments are FullPath)
+        /// </summary>
+        /// <param name="downloadDirectory"></param>
+        /// <param name="installDirectory"></param>
+        /// <param name="onDownloadProgressChanged"></param>
+        /// <param name="keyword"></param>
+        /// <exception cref="MessageException"></exception>
+        public static void DownloadAndUpdate(string downloadDirectory,
+            string installDirectory,
+            DownloadProgressChangedEventHandler onDownloadProgressChanged,
+            string? keyword = null)
         {
-            _targetPath = targetPath;
-            _tempFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-            Directory.CreateDirectory(_tempFolder);
+            UpdateChecker.GetLatestUpdateFileNameAndHash(out var updateFileName, out var sha256, keyword);
 
-            _updateFilePath = Path.GetFullPath(updateFilePath);
-            _keepDirectory = _keepDirectory.Select(s => Path.Combine(targetPath, s));
+            // update file Full Path
+            var updateFile = Path.Combine(downloadDirectory, updateFileName);
+            var updater = new Updater(updateFile, installDirectory);
+
+            if (File.Exists(updateFile))
+            {
+                if (Utils.Utils.SHA256CheckSum(updateFile) == sha256)
+                {
+                    updater.ApplyUpdate();
+                    return;
+                }
+
+                File.Delete(updateFile);
+            }
+
+            DownloadUpdateFile(onDownloadProgressChanged, updateFile, sha256);
+            updater.ApplyUpdate();
         }
 
+        /// <summary>
+        ///     Download Update File
+        /// </summary>
+        /// <param name="onDownloadProgressChanged"></param>
+        /// <param name="fileFullPath"></param>
+        /// <param name="sha256"></param>
+        /// <exception cref="MessageException"></exception>
+        private static void DownloadUpdateFile(DownloadProgressChangedEventHandler onDownloadProgressChanged, string fileFullPath, string sha256)
+        {
+            using WebClient client = new();
+            try
+            {
+                client.DownloadProgressChanged += onDownloadProgressChanged;
+                client.DownloadFile(new Uri(UpdateChecker.LatestRelease.assets[0].browser_download_url), fileFullPath);
+            }
+            finally
+            {
+                client.DownloadProgressChanged -= onDownloadProgressChanged;
+            }
+
+            if (Utils.Utils.SHA256CheckSum(fileFullPath) != sha256)
+                throw new MessageException(i18N.Translate("The downloaded file has the wrong hash"));
+        }
+
+        #endregion
+
+        private readonly string _updateFile;
+        private readonly string _installDirectory;
+        private readonly string _tempDirectory;
+
+        private Updater(string updateFile, string installDirectory)
+        {
+            _updateFile = updateFile;
+            _installDirectory = installDirectory;
+            _tempDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+
+            Directory.CreateDirectory(_tempDirectory);
+        }
+
+        #region Apply Update
+
+        private static readonly ImmutableArray<string> KeepDirectories = new List<string> {"data", "mode\\Custom", "logging"}.ToImmutableArray();
+
         private void ApplyUpdate()
         {
-            var extractPath = Path.Combine(_tempFolder, "extract");
+            var mainForm = Global.MainForm;
+
+            #region PreUpdate
+
+            ModeHelper.SuspendWatcher = true;
+            // Stop and Save
+            mainForm.Stop();
+            Configuration.Save();
+
+            // Backup Configuration file
+            try
+            {
+                File.Copy(Configuration.SettingFileFullName, Configuration.SettingFileFullName + ".bak", true);
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+
+            #endregion
+
+            // extract Update file to {tempDirectory}\extract
+            var extractPath = Path.Combine(_tempDirectory, "extract");
             int exitCode;
             if ((exitCode = Extract(extractPath, true)) != 0)
                 throw new Exception(i18N.Translate($"7za exit with code {exitCode}"));
 
+            // rename install directory files with .old suffix unless in keep folders
             MarkFilesOld();
 
-            MoveAllFilesOver(Path.Combine(extractPath, "Netch"), _targetPath);
+            // move {tempDirectory}\extract\Netch to install folder
+            MoveAllFilesOver(Path.Combine(extractPath, "Netch"), _installDirectory);
 
-            Configuration.Save();
-            Global.Mutex.ReleaseMutex();
+            // release mutex, exit
+            mainForm.Invoke(new Action(Netch.SingleInstance.Dispose));
             Process.Start(Global.NetchExecutable);
-            Global.MainForm.Exit(true, false);
+            Environment.Exit(0);
         }
 
         private void MarkFilesOld()
         {
-            foreach (var file in Directory.GetFiles(_targetPath, "*", SearchOption.AllDirectories))
+            // extend keepDirectories relative path to absolute path
+            var extendedKeepDirectories = KeepDirectories.Select(d => Path.Combine(_installDirectory, d)).ToImmutableArray();
+
+            // weed out keep files
+            List<string> filesToDelete = new();
+            foreach (var file in Directory.GetFiles(_installDirectory, "*", SearchOption.AllDirectories))
             {
-                if (_keepDirectory.Any(p => file.StartsWith(p)))
+                if (extendedKeepDirectories.Any(p => file.StartsWith(p)))
                     continue;
 
+                if (Path.GetFileName(file) is ModeHelper.DisableModeDirectoryFileName)
+                    continue;
+
+                filesToDelete.Add(file);
+            }
+
+            // rename files
+            foreach (var file in filesToDelete)
                 try
                 {
                     File.Move(file, file + ".old");
                 }
                 catch
                 {
-                    throw new Exception("Updater wasn't able to rename file: " + file);
+                    Logging.Error($"failed to rename file \"{file}\"");
+                    throw;
                 }
-            }
         }
 
         private int Extract(string destDirName, bool overwrite)
         {
-            var temp7za = Path.Combine(_tempFolder, "7za.exe");
+            // release 7za.exe to {tempDirectory}\7za.exe
+            var temp7za = Path.Combine(_tempDirectory, "7za.exe");
 
             if (!File.Exists(temp7za))
                 File.WriteAllBytes(temp7za, Resources._7za);
 
+            // run 7za
             var argument = new StringBuilder();
-            argument.Append($" x \"{_updateFilePath}\" -o\"{destDirName}\"");
+            argument.Append($" x \"{_updateFile}\" -o\"{destDirName}\"");
             if (overwrite)
                 argument.Append(" -y");
 
@@ -108,6 +212,10 @@ namespace Netch.Updater
             }
         }
 
+        #endregion
+
+        #region Clean files marked as old when start
+
         public static void CleanOld(string targetPath)
         {
             foreach (var f in Directory.GetFiles(targetPath, "*.old", SearchOption.AllDirectories))
@@ -121,40 +229,6 @@ namespace Netch.Updater
                 }
         }
 
-        public static async Task DownloadAndUpdate(string downloadPath,
-            string targetPath,
-            DownloadProgressChangedEventHandler onDownloadProgressChanged)
-        {
-            var keyword = (string?) null;
-
-            if (!UpdateChecker.GetFileNameAndHashFromMarkdownForm(UpdateChecker.LatestRelease.body, out var fileName, out var sha256, keyword))
-                throw new Exception(i18N.Translate("parse release note failed"));
-
-            var fileFullPath = Path.Combine(downloadPath, fileName);
-            var updater = new Updater(fileFullPath, targetPath);
-
-            if (!(File.Exists(fileFullPath) && Utils.Utils.SHA256CheckSum(fileFullPath) == sha256))
-            {
-                using WebClient client = new();
-                try
-                {
-                    client.DownloadProgressChanged += onDownloadProgressChanged;
-                    await client.DownloadFileTaskAsync(new Uri(UpdateChecker.LatestRelease.assets[0].browser_download_url), fileFullPath);
-                }
-                catch (Exception e)
-                {
-                    throw new Exception(i18N.Translate("Download Update Failed", ": ") + e.Message);
-                }
-                finally
-                {
-                    client.DownloadProgressChanged -= onDownloadProgressChanged;
-                }
-
-                if (Utils.Utils.SHA256CheckSum(fileFullPath) != sha256)
-                    throw new Exception(i18N.Translate("The downloaded file has the wrong hash"));
-            }
-
-            updater.ApplyUpdate();
-        }
+        #endregion
     }
 }

Netch/Utils/Bandwidth.cs

@@ -6,7 +6,6 @@ using Microsoft.Diagnostics.Tracing.Parsers;
 using Microsoft.Diagnostics.Tracing.Session;
 using Netch.Controllers;
 using Netch.Models;
-using Netch.Servers.Shadowsocks;
 
 namespace Netch.Utils
 {
@@ -45,7 +44,7 @@ namespace Netch.Utils
         /// </summary>
         public static void NetTraffic()
         {
-            if (!Global.Flags.IsWindows10Upper)
+            if (!Flags.IsWindows10Upper)
                 return;
 
             var counterLock = new object();
@@ -57,9 +56,6 @@ namespace Netch.Utils
             {
                 case null:
                     break;
-                case SSController {DllFlag: true}:
-                    instances.Add(Process.GetCurrentProcess());
-                    break;
                 case Guard instanceController:
                     if (instanceController.Instance != null)
                         instances.Add(instanceController.Instance);
@@ -72,9 +68,6 @@ namespace Netch.Utils
                 {
                     case null:
                         break;
-                    case HTTPController httpController:
-                        instances.Add(httpController.PrivoxyController.Instance!);
-                        break;
                     case NFController _:
                         instances.Add(Process.GetCurrentProcess());
                         break;

Netch/Utils/Configuration.cs

@@ -12,12 +12,10 @@ namespace Netch.Utils
         /// <summary>
         ///     数据目录
         /// </summary>
-        public const string DATA_DIR = "data";
+        public static string DataDirectoryFullName => Path.Combine(Global.NetchDir, "data");
+
+        public static string SettingFileFullName => $"{DataDirectoryFullName}\\settings.json";
 
-        /// <summary>
-        ///     设置
-        /// </summary>
-        public static readonly string SETTINGS_JSON = $"{DATA_DIR}\\settings.json";
         private static readonly JsonSerializerOptions JsonSerializerOptions = Global.NewDefaultJsonSerializerOptions;
 
         static Configuration()
@@ -31,45 +29,42 @@ namespace Netch.Utils
         /// </summary>
         public static void Load()
         {
-            if (File.Exists(SETTINGS_JSON))
+            if (File.Exists(SettingFileFullName))
             {
-                Global.Settings = ParseSetting(File.ReadAllText(SETTINGS_JSON));
+                try
+                {
+                    using var fileStream = File.OpenRead(SettingFileFullName);
+                    var settings = JsonSerializer.DeserializeAsync<Setting>(fileStream, JsonSerializerOptions).Result!;
+
+                    CheckSetting(settings);
+
+                    Global.Settings = settings;
+                }
+                catch (Exception e)
+                {
+                    Logging.Error(e.ToString());
+                    Utils.Open(Logging.LogFile);
+                    Environment.Exit(-1);
+                    Global.Settings = null!;
+                }
             }
             else
             {
-                // 弹出提示
-                i18N.Load("System");
-
-                // 创建 data 文件夹并保存默认设置
+                // 保存默认设置
                 Save();
             }
         }
 
-        public static Setting ParseSetting(string text)
+        private static void CheckSetting(Setting settings)
         {
-            try
-            {
-                var settings = JsonSerializer.Deserialize<Setting>(text, JsonSerializerOptions)!;
+            settings.Profiles.RemoveAll(p => p.ServerRemark == string.Empty || p.ModeRemark == string.Empty);
 
-                #region Check Profile
+            if (settings.Profiles.Any(p => settings.Profiles.Any(p1 => p1 != p && p1.Index == p.Index)))
+                for (var i = 0; i < settings.Profiles.Count; i++)
+                    settings.Profiles[i].Index = i;
 
-                settings.Profiles.RemoveAll(p => p.ServerRemark == string.Empty || p.ModeRemark == string.Empty);
-
-                if (settings.Profiles.Any(p => settings.Profiles.Any(p1 => p1 != p && p1.Index == p.Index)))
-                    for (var i = 0; i < settings.Profiles.Count; i++)
-                        settings.Profiles[i].Index = i;
-
-                #endregion
-
-                return settings;
-            }
-            catch (Exception e)
-            {
-                Logging.Error(e.ToString());
-                Utils.Open(Logging.LogFile);
-                Environment.Exit(-1);
-                return null!;
-            }
+            settings.AioDNS.ChinaDNS = Utils.HostAppendPort(settings.AioDNS.ChinaDNS);
+            settings.AioDNS.OtherDNS = Utils.HostAppendPort(settings.AioDNS.OtherDNS);
         }
 
         /// <summary>
@@ -77,10 +72,10 @@ namespace Netch.Utils
         /// </summary>
         public static void Save()
         {
-            if (!Directory.Exists(DATA_DIR))
-                Directory.CreateDirectory(DATA_DIR);
+            if (!Directory.Exists(DataDirectoryFullName))
+                Directory.CreateDirectory(DataDirectoryFullName);
 
-            File.WriteAllBytes(SETTINGS_JSON, JsonSerializer.SerializeToUtf8Bytes(Global.Settings, JsonSerializerOptions));
+            File.WriteAllBytes(SettingFileFullName, JsonSerializer.SerializeToUtf8Bytes(Global.Settings, JsonSerializerOptions));
         }
     }
 }

Netch/Utils/HttpProxyHandler/HttpWebServer.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Net;
-using System.Text;
-
-namespace Netch.Utils.HttpProxyHandler
-{
-    public class HttpWebServer
-    {
-        private readonly Func<HttpListenerRequest, string>? _responderMethod;
-        private HttpListener? _listener;
-
-        public HttpWebServer(string[] prefixes, Func<HttpListenerRequest, string> method)
-        {
-            _listener = new HttpListener();
-
-            // URI prefixes are required, for example 
-            // "http://localhost:8080/index/".
-            if (prefixes == null || prefixes.Length == 0)
-                throw new ArgumentException("prefixes");
-
-            // A responder method is required
-            if (method == null)
-                throw new ArgumentException("method");
-
-            foreach (var s in prefixes)
-                _listener.Prefixes.Add(s);
-
-            _responderMethod = method;
-            _listener.Start();
-        }
-
-        public HttpWebServer(Func<HttpListenerRequest, string> method, params string[] prefixes) : this(prefixes, method)
-        {
-        }
-
-        public void StartWaitingRequest()
-        {
-            Logging.Info("Webserver running...");
-            while (_listener?.IsListening ?? false)
-            {
-                HttpListenerContext ctx;
-                try
-                {
-                    ctx = _listener.GetContext();
-                }
-                catch
-                {
-                    break;
-                }
-
-                try
-                {
-                    var rstr = _responderMethod!(ctx.Request);
-                    var buf = Encoding.UTF8.GetBytes(rstr);
-                    ctx.Response.StatusCode = 200;
-                    ctx.Response.ContentType = "application/x-ns-proxy-autoconfig";
-                    ctx.Response.ContentLength64 = buf.Length;
-                    ctx.Response.OutputStream.Write(buf, 0, buf.Length);
-                }
-                finally
-                {
-                    ctx.Response.OutputStream.Close();
-                }
-            }
-        }
-
-        public void Stop()
-        {
-            if (_listener != null)
-            {
-                _listener.Stop();
-                _listener.Close();
-                _listener = null;
-            }
-        }
-    }
-}

Netch/Utils/HttpProxyHandler/PACServerHandle.cs

@@ -1,83 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Netch.Controllers;
-
-namespace Netch.Utils.HttpProxyHandler
-{
-    /// <summary>
-    ///     提供PAC功能支持
-    /// </summary>
-    internal static class PACServerHandle
-    {
-        private static HttpWebServer? _httpWebServer;
-        private static string? _pacContent;
-
-        public static string InitPACServer(string address)
-        {
-            try
-            {
-                _pacContent = GetPacList(address);
-                var prefixes = $"http://{address}:{Global.Settings.Pac_Port}/pac/";
-
-                _httpWebServer = new HttpWebServer(SendResponse, prefixes);
-                Task.Run(() => _httpWebServer.StartWaitingRequest());
-
-                var pacUrl = GetPacUrl();
-                Logging.Info($"Webserver InitServer OK: {pacUrl}");
-                return pacUrl;
-            }
-            catch
-            {
-                Logging.Error("Webserver InitServer Failed");
-                throw;
-            }
-        }
-
-        public static string SendResponse(HttpListenerRequest request)
-        {
-            return _pacContent!;
-        }
-
-        public static void Stop()
-        {
-            try
-            {
-                _httpWebServer?.Stop();
-            }
-            catch
-            {
-                // ignored
-            }
-
-            _httpWebServer = null;
-        }
-
-        private static string GetPacList(string address)
-        {
-            try
-            {
-                var proxy = $"PROXY {address}:{Global.Settings.HTTPLocalPort};";
-                var pacfile = Path.Combine(Global.NetchDir, "bin\\pac.txt");
-
-                var pac = File.ReadAllText(pacfile, Encoding.UTF8).Replace("__PROXY__", proxy);
-                return pac;
-            }
-            catch
-            {
-                throw new MessageException("Pac file not found!");
-            }
-        }
-
-        /// <summary>
-        ///     获取PAC地址
-        /// </summary>
-        /// <returns></returns>
-        public static string GetPacUrl()
-        {
-            return $"http://127.0.0.1:{Global.Settings.Pac_Port}/pac/?t={DateTime.Now:yyyyMMddHHmmssfff}";
-        }
-    }
-}

Netch/Utils/Logging.cs

@@ -39,15 +39,32 @@ namespace Netch.Utils
 
         private static void Write(string text, LogLevel logLevel)
         {
-            var contents = $@"[{DateTime.Now}][{logLevel.ToString()}] {text}{Global.EOF}";
-            if (Global.Testing)
+            var contents = $@"[{DateTime.Now}][{logLevel.ToString()}] {text}{Constants.EOF}";
+#if DEBUG
+            switch (logLevel)
             {
-                Console.WriteLine(contents);
-                return;
+                case LogLevel.DEBUG:
+                case LogLevel.INFO:
+                case LogLevel.WARNING:
+                    Console.Write(contents);
+                    break;
+                case LogLevel.ERROR:
+                    Console.Error.Write(contents);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
             }
-
+#else
             lock (FileLock)
                 File.AppendAllText(LogFile, contents);
+#endif
+        }
+
+        public static void Debug(string s)
+        {
+#if DEBUG
+            Write(s, LogLevel.DEBUG);
+#endif
         }
     }
 }

Netch/Utils/ModeHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Netch.Controllers;
@@ -11,98 +10,88 @@ namespace Netch.Utils
 {
     public static class ModeHelper
     {
-        private const string MODE_DIR = "mode";
+        public const string DisableModeDirectoryFileName = "disabled";
 
-        public static readonly string ModeDirectory = Path.Combine(Global.NetchDir, $"{MODE_DIR}\\");
+        public static string ModeDirectoryFullName => Path.Combine(Global.NetchDir, "mode");
+
+        private static readonly FileSystemWatcher FileSystemWatcher;
+
+        public static bool SuspendWatcher { get; set; } = false;
+
+        static ModeHelper()
+        {
+            FileSystemWatcher = new FileSystemWatcher(ModeDirectoryFullName)
+            {
+                NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.Size | NotifyFilters.FileName,
+                IncludeSubdirectories = true,
+                EnableRaisingEvents = true
+            };
+
+            FileSystemWatcher.Changed += OnModeChanged;
+            FileSystemWatcher.Created += OnModeChanged;
+            FileSystemWatcher.Deleted += OnModeChanged;
+            FileSystemWatcher.Renamed += OnModeChanged;
+        }
+
+        private static void OnModeChanged(object sender, FileSystemEventArgs e)
+        {
+            if (SuspendWatcher)
+                return;
+
+            Load();
+            Global.MainForm.LoadModes();
+        }
 
         public static string GetRelativePath(string fullName)
         {
-            return fullName.Substring(ModeDirectory.Length);
+            var length = ModeDirectoryFullName.Length;
+            if (!ModeDirectoryFullName.EndsWith("\\"))
+                length++;
+
+            return fullName.Substring(length);
         }
 
         public static string GetFullPath(string relativeName)
         {
-            return Path.Combine(ModeDirectory, relativeName);
-        }
-
-        public static string GetFullPath(Mode mode)
-        {
-            return Path.Combine(ModeDirectory, mode.RelativePath);
+            return Path.Combine(ModeDirectoryFullName, relativeName);
         }
 
         /// <summary>
-        ///     从模式文件夹读取模式并为 <see cref="Forms.MainForm.ModeComboBox" /> 绑定数据
+        ///     从模式文件夹读取模式
         /// </summary>
         public static void Load()
         {
             Global.Modes.Clear();
-
-            if (!Directory.Exists(MODE_DIR))
-                return;
-
-            var stack = new Stack<string>();
-            stack.Push(MODE_DIR);
-            while (stack.Count > 0)
-            {
-                var dirInfo = new DirectoryInfo(stack.Pop());
-                try
-                {
-                    foreach (var childDirInfo in dirInfo.GetDirectories())
-                        stack.Push(childDirInfo.FullName);
-
-                    foreach (var childFileInfo in dirInfo.GetFiles().Where(info => info.Name.EndsWith(".txt")))
-                        LoadModeFile(childFileInfo.FullName);
-                }
-                catch
-                {
-                    // ignored
-                }
-            }
+            LoadModeDirectory(ModeDirectoryFullName);
 
             Sort();
         }
 
-        private static void LoadModeFile(string fullName)
+        private static void LoadModeDirectory(string modeDirectory)
         {
-            var mode = new Mode(fullName);
-
-            var content = File.ReadAllLines(fullName);
-            if (content.Length == 0)
-                return;
-
-            for (var i = 0; i < content.Length; i++)
+            try
             {
-                var text = content[i].Trim();
+                foreach (var directory in Directory.GetDirectories(modeDirectory))
+                    LoadModeDirectory(directory);
 
-                if (i == 0)
-                {
-                    if (text.First() != '#')
-                        return;
+                // skip Directory with a disabled file in
+                if (File.Exists(Path.Combine(modeDirectory, DisableModeDirectoryFileName)))
+                    return;
 
+                foreach (var file in Directory.GetFiles(modeDirectory).Where(f => f.EndsWith(".txt")))
                     try
                     {
-                        var splited = text.Substring(1).SplitTrimEntries(',');
-
-                        mode.Remark = splited[0];
-
-                        var typeResult = int.TryParse(splited.ElementAtOrDefault(1), out var type);
-                        mode.Type = typeResult ? type : 0;
-
-                        var bypassChinaResult = int.TryParse(splited.ElementAtOrDefault(2), out var bypassChina);
-                        mode.BypassChina = mode.ClientRouting() && bypassChinaResult && bypassChina == 1;
+                        Global.Modes.Add(new Mode(file));
                     }
-                    catch
+                    catch (Exception e)
                     {
-                        return;
+                        Logging.Warning($"Load mode \"{file}\" failed: {e.Message}");
                     }
-                }
-                else
-                {
-                    mode.Rule.Add(text);
-                }
             }
-
-            Global.Modes.Add(mode);
+            catch
+            {
+                // ignored
+            }
         }
 
         private static void Sort()
@@ -110,61 +99,46 @@ namespace Netch.Utils
             Global.Modes.Sort((a, b) => string.Compare(a.Remark, b.Remark, StringComparison.Ordinal));
         }
 
-        public static void Add(Mode mode)
-        {
-            Global.Modes.Add(mode);
-            Sort();
-            Global.MainForm.LoadModes();
-        }
-
         public static void Delete(Mode mode)
         {
-            var fullName = GetFullPath(mode);
-            if (File.Exists(fullName))
-                File.Delete(fullName);
+            if (mode.FullName == null)
+                throw new ArgumentException(nameof(mode.FullName));
 
-            Global.Modes.Remove(mode);
-            Global.MainForm.LoadModes();
+            File.Delete(mode.FullName);
         }
 
         public static bool SkipServerController(Server server, Mode mode)
         {
-            return mode.Type switch
-                   {
-                       0 => server switch
-                            {
-                                Socks5 => true,
-                                Shadowsocks shadowsocks when !shadowsocks.HasPlugin() && Global.Settings.RedirectorSS => true,
-                                _ => false
-                            },
-                       _ => false
-                   };
+            switch (mode.Type)
+            {
+                case 0:
+                    return server switch
+                           {
+                               Socks5 => true,
+                               Shadowsocks shadowsocks when !shadowsocks.HasPlugin() && Global.Settings.Redirector.RedirectorSS => true,
+                               _ => false
+                           };
+                case 1:
+                case 2:
+                    return server is Socks5;
+                default:
+                    return false;
+            }
         }
 
-        public static IModeController? GetModeControllerByType(int type, out ushort? port, out string portName, out PortType portType)
+        public static readonly int[] ModeTypes = {0, 1, 2, 6};
+
+        public static IModeController GetModeControllerByType(int type, out ushort? port, out string portName)
         {
             port = null;
             portName = string.Empty;
-            portType = PortType.Both;
             switch (type)
             {
                 case 0:
-                    port = Global.Settings.RedirectorTCPPort;
-                    portName = "Redirector TCP";
-                    portType = PortType.TCP;
                     return new NFController();
                 case 1:
                 case 2:
-                    return new TUNTAPController();
-                case 3:
-                case 5:
-                    port = Global.Settings.HTTPLocalPort;
-                    portName = "HTTP";
-                    portType = PortType.TCP;
-                    StatusPortInfoText.HttpPort = (ushort) port;
-                    return new HTTPController();
-                case 4:
-                    return null;
+                    return new TUNController();
                 case 6:
                     return new PcapController();
                 default:

Netch/Utils/OnlyInstance.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-
-namespace Netch.Utils
-{
-    public static class OnlyInstance
-    {
-        public enum Commands
-        {
-            Show,
-            Exit
-        }
-
-        public static event EventHandler<Commands>? Called;
-
-        private static void OnCalled(Commands e)
-        {
-            Called?.Invoke(null, e);
-        }
-
-        public static async void Server()
-        {
-            try
-            {
-                const int tryLimit = 3;
-                var i = tryLimit;
-                while (i > 0)
-                    try
-                    {
-                        PortHelper.CheckPort(Global.Settings.UDPSocketPort, PortType.UDP);
-                        if (i != tryLimit)
-                            Configuration.Save();
-
-                        break;
-                    }
-                    catch
-                    {
-                        Global.Settings.UDPSocketPort = PortHelper.GetAvailablePort(PortType.UDP);
-                        i--;
-                    }
-
-                var data = new byte[1024];
-                var newsock = new UdpClient(new IPEndPoint(IPAddress.Loopback, Global.Settings.UDPSocketPort));
-
-                while (true)
-                {
-                    var result = await newsock.ReceiveAsync();
-                    data = result.Buffer;
-                    if (Enum.TryParse<Commands>(Encoding.ASCII.GetString(data, 0, data.Length), out var command))
-                        OnCalled(command);
-                }
-            }
-            catch (Exception e)
-            {
-                Logging.Error(e.ToString());
-            }
-        }
-
-        public static async void Send(Commands command)
-        {
-            try
-            {
-                using var udpClient = new UdpClient(new IPEndPoint(IPAddress.Loopback, Global.Settings.UDPSocketPort));
-                udpClient.Connect(IPAddress.Loopback, Global.Settings.UDPSocketPort);
-                var sendBytes = Encoding.ASCII.GetBytes(command.ToString());
-                await udpClient.SendAsync(sendBytes, sendBytes.Length);
-
-                udpClient.Close();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-        }
-    }
-}

Netch/Utils/PortHelper.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Net.NetworkInformation;
-using Netch.Models;
+using static Vanara.PInvoke.IpHlpApi;
+using static Vanara.PInvoke.Ws2_32;
+using Range = Netch.Models.Range;
 
 namespace Netch.Utils
 {
@@ -26,6 +28,16 @@ namespace Netch.Utils
             }
         }
 
+        public static IEnumerable<Process> GetProcessByUsedTcpPort(ushort port)
+        {
+            if (port == 0)
+                throw new ArgumentOutOfRangeException();
+
+            var row = GetTcpTable2().Where(r => ntohs((ushort) r.dwLocalPort) == port).Where(r => r.dwOwningPid is not (0 or 4));
+
+            return row.Select(r => Process.GetProcessById((int) r.dwOwningPid));
+        }
+
         private static void GetReservedPortRange(PortType portType, ref List<Range> targetList)
         {
             var process = new Process

Netch/Utils/ServerConverterWithTypeDiscriminator.cs

@@ -20,6 +20,7 @@ namespace Netch.Utils
             }
             catch
             {
+                // Unsupported Server Type
                 return JsonSerializer.Deserialize<Server>(jsonElement.GetRawText(), new JsonSerializerOptions())!;
             }
         }

Netch/Utils/ServerHelper.cs

@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using System.Timers;
 using Netch.Models;
+using Range = Netch.Models.Range;
 
 namespace Netch.Utils
 {
@@ -16,7 +17,7 @@ namespace Netch.Utils
                 .GetExportedTypes()
                 .Where(type => type.GetInterfaces().Contains(typeof(IServerUtil)));
 
-            ServerUtils = serversUtilsTypes.Select(t => (IServerUtil) Activator.CreateInstance(t)).OrderBy(util => util.Priority);
+            ServerUtils = serversUtilsTypes.Select(t => (IServerUtil) Activator.CreateInstance(t)!).OrderBy(util => util.Priority);
         }
 
         public static Type GetTypeByTypeName(string typeName)

Netch/Utils/ShareLink.cs

@@ -32,7 +32,7 @@ namespace Netch.Utils
 
             try
             {
-                list.AddRange(JsonSerializer.Deserialize<List<ShadowsocksConfig>>(text)
+                list.AddRange(JsonSerializer.Deserialize<List<ShadowsocksConfig>>(text)!
                     .Select(server => new Shadowsocks
                     {
                         Hostname = server.server,

Netch/Utils/StringExtension.cs

@@ -48,8 +48,9 @@ namespace Netch.Utils
             var sb = new StringBuilder();
             foreach (var t in value)
             {
-                if (new[] {'\\', '(', ')', '[', ']', '.'}.Any(s => s == t))
-                    sb.Append(@"\");
+                var escapeCharacters = new[] {'\\', '*', '+', '?', '|', '{', '}', '[', ']', '(', ')', '^', '$', '.'};
+                if (escapeCharacters.Any(s => s == t))
+                    sb.Append('\\');
 
                 sb.Append(t);
             }
@@ -59,12 +60,12 @@ namespace Netch.Utils
 
         public static string[] SplitRemoveEmptyEntriesAndTrimEntries(this string value, params char[] separator)
         {
-            return value.Split(separator).Select(s => s.Trim()).Where(s => s != string.Empty).ToArray();
+            return value.Split(separator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
         }
 
         public static string[] SplitTrimEntries(this string value, params char[] separator)
         {
-            return value.Split(separator).Select(s => s.Trim()).ToArray();
+            return value.Split(separator, StringSplitOptions.TrimEntries);
         }
 
         public static string[] SplitRemoveEmptyEntries(this string value, params char[] separator)

Netch/Utils/TUNTAP.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Microsoft.Win32;
-using Netch.Controllers;
-
-namespace Netch.Utils
-{
-    public static class TUNTAP
-    {
-        public static string TUNTAP_COMPONENT_ID_0901 = "tap0901";
-        public static string TUNTAP_COMPONENT_ID_0801 = "tap0801";
-        public static string NETWORK_KEY = @"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}";
-        public static string ADAPTER_KEY = @"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002BE10318}";
-
-        /// <summary>
-        ///     获取 TUN/TAP 适配器 ID
-        /// </summary>
-        /// <returns>适配器 ID</returns>
-        public static string? GetComponentID()
-        {
-            try
-            {
-                var adaptersRegistry = Registry.LocalMachine.OpenSubKey(ADAPTER_KEY)!;
-
-                foreach (var keyName in adaptersRegistry.GetSubKeyNames().Where(s => s is not ("Configuration" or "Properties")))
-                {
-                    var adapterRegistry = adaptersRegistry.OpenSubKey(keyName)!;
-                    var componentId = adapterRegistry.GetValue("ComponentId")?.ToString();
-                    if (componentId == null)
-                        continue;
-
-                    if (componentId == TUNTAP_COMPONENT_ID_0901 || componentId == TUNTAP_COMPONENT_ID_0801)
-                        return (string) (adapterRegistry.GetValue("NetCfgInstanceId") ??
-                                         throw new Exception("Tap adapter have no NetCfgInstanceId key"));
-                }
-            }
-            catch (Exception e)
-            {
-                Logging.Warning(e.ToString());
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        ///     获取 TUN/TAP 适配器名称
-        /// </summary>
-        /// <param name="componentId">适配器 ID</param>
-        /// <returns>适配器名称</returns>
-        public static string GetName(string componentId)
-        {
-            var registry = Registry.LocalMachine.OpenSubKey($"{NETWORK_KEY}\\{componentId}\\Connection");
-
-            return registry.GetValue("Name", "").ToString();
-        }
-
-        /// <summary>
-        ///     创建 TUN/TAP 适配器
-        /// </summary>
-        /// <returns></returns>
-        public static bool Create()
-        {
-            return false;
-        }
-
-        /// <summary>
-        ///     卸载tap网卡
-        /// </summary>
-        public static void deltapall()
-        {
-            Logging.Info("卸载 TUN/TAP 适配器");
-            var installProcess = new Process
-                {StartInfo = {WindowStyle = ProcessWindowStyle.Hidden, FileName = Path.Combine("bin/tap-driver", "deltapall.bat")}};
-
-            installProcess.Start();
-            installProcess.WaitForExit();
-            installProcess.Close();
-        }
-
-        /// <summary>
-        ///     安装tap网卡
-        /// </summary>
-        public static void AddTap()
-        {
-            Logging.Info("安装 TUN/TAP 适配器");
-            //安装Tap Driver
-            using var process = Process.Start(new ProcessStartInfo
-            {
-                FileName = Path.Combine("bin/tap-driver", "addtap.bat"),
-                WindowStyle = ProcessWindowStyle.Hidden
-            })!;
-
-            process.WaitForExit();
-
-            Thread.Sleep(1000);
-            if (GetComponentID() == null)
-                throw new MessageException("TAP 驱动安装失败，找不到 ComponentID 注册表项");
-        }
-    }
-}

Netch/Utils/Utils.cs

@@ -21,8 +21,6 @@ namespace Netch.Utils
     {
         public static bool Open(string path)
         {
-            if (Global.Testing)
-                return true;
             try
             {
                 Process.Start(new ProcessStartInfo
@@ -116,29 +114,13 @@ namespace Netch.Utils
             }
         }
 
-        public static void KillProcessByName(string name)
-        {
-            try
-            {
-                foreach (var p in Process.GetProcessesByName(name))
-                    if (p.MainModule != null && p.MainModule.FileName.StartsWith(Global.NetchDir))
-                        p.Kill();
-            }
-            catch (Win32Exception e)
-            {
-                Logging.Error($"结束进程 {name} 错误：" + e.Message);
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
-        }
-
         public static string GetFileVersion(string file)
         {
-            return File.Exists(file) ? FileVersionInfo.GetVersionInfo(file).FileVersion : string.Empty;
-        }
+            if (File.Exists(file))
+                return FileVersionInfo.GetVersionInfo(file).FileVersion ?? "";
 
+            return "";
+        }
 
         public static void DrawCenterComboBox(object sender, DrawItemEventArgs e)
         {
@@ -243,5 +225,55 @@ namespace Netch.Utils
                     break;
             }
         }
+
+        public static async Task ProcessRunHiddenAsync(string fileName, string arguments = "", bool print = true)
+        {
+            var p = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = fileName,
+                    Arguments = arguments,
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    Verb = "runas",
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    CreateNoWindow = true
+                }
+            };
+
+            Logging.Debug($"{fileName} {arguments}");
+
+            p.Start();
+            var output = await p.StandardOutput.ReadToEndAsync();
+            var error = await p.StandardError.ReadToEndAsync();
+            if (print)
+            {
+                Console.Write(output);
+                Console.Write(error);
+            }
+
+            p.WaitForExit();
+        }
+
+        public static int SubnetToCidr(string value)
+        {
+            var subnet = IPAddress.Parse(value);
+            return SubnetToCidr(subnet);
+        }
+
+        public static int SubnetToCidr(IPAddress subnet)
+        {
+            return subnet.GetAddressBytes().Sum(b => Convert.ToString(b, 2).Count(c => c == '1'));
+        }
+
+        public static string HostAppendPort(string host, ushort port = 53)
+        {
+            if (!host.Contains(':'))
+                host += $":{port}";
+
+            return host;
+        }
     }
 }

Netch/Utils/WebUtil.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Net;
-using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -30,13 +29,6 @@ namespace Netch.Utils
             return req;
         }
 
-        public static IPEndPoint BestLocalEndPoint(IPEndPoint remoteIPEndPoint)
-        {
-            var testSocket = new Socket(remoteIPEndPoint.AddressFamily, SocketType.Dgram, ProtocolType.Udp);
-            testSocket.Connect(remoteIPEndPoint);
-            return (IPEndPoint) testSocket.LocalEndPoint;
-        }
-
         /// <summary>
         ///     异步下载
         /// </summary>
@@ -44,9 +36,9 @@ namespace Netch.Utils
         /// <returns></returns>
         public static async Task<byte[]> DownloadBytesAsync(HttpWebRequest req)
         {
-            using var webResponse = (HttpWebResponse) await req.GetResponseAsync();
-            using var memoryStream = new MemoryStream();
-            using var input = webResponse.GetResponseStream();
+            using var webResponse = req.GetResponseAsync();
+            await using var memoryStream = new MemoryStream();
+            await using var input = webResponse.Result.GetResponseStream();
 
             await input.CopyToAsync(memoryStream);
             return memoryStream.ToArray();
@@ -77,7 +69,7 @@ namespace Netch.Utils
         public static async Task<string> DownloadStringAsync(HttpWebRequest req, string encoding = "UTF-8")
         {
             using var webResponse = await req.GetResponseAsync();
-            using var responseStream = webResponse.GetResponseStream();
+            await using var responseStream = webResponse.GetResponseStream();
             using var streamReader = new StreamReader(responseStream, Encoding.GetEncoding(encoding));
 
             return await streamReader.ReadToEndAsync();
@@ -92,8 +84,8 @@ namespace Netch.Utils
         public static async Task DownloadFileAsync(HttpWebRequest req, string fileFullPath)
         {
             using var webResponse = (HttpWebResponse) await req.GetResponseAsync();
-            using var input = webResponse.GetResponseStream();
-            using var fileStream = File.OpenWrite(fileFullPath);
+            await using var input = webResponse.GetResponseStream();
+            await using var fileStream = File.OpenWrite(fileFullPath);
 
             await input.CopyToAsync(fileStream);
             fileStream.Flush();

Netch/Utils/i18N.cs

@@ -88,7 +88,7 @@ namespace Netch.Utils
             var a = new StringBuilder();
             foreach (var t in text)
                 if (t is string)
-                    a.Append(Data.Contains(t) ? Data[t].ToString() : t);
+                    a.Append(Data[t]?.ToString() ?? t);
                 else
                     a.Append(t);
 

PUBLISH.ps1

@@ -0,0 +1,16 @@
+Write-Host 'Building'
+
+dotnet publish `
+	-c "Release" `
+	-r "win-x64" `
+	-p:Platform="x64" `
+	-p:PublishSingleFile=true `
+	-p:SelfContained=false `
+	-p:PublishTrimmed=false `
+	-p:PublishReadyToRun=false `
+	-o Netch\bin\Publish\ `
+	Netch\Netch.csproj
+
+if ($LASTEXITCODE) { exit $LASTEXITCODE } 
+
+Write-Host 'Build done'

README.md

@@ -7,9 +7,9 @@
 [![Netch CI](https://github.com/NetchX/Netch/workflows/Netch%20CI/badge.svg)](https://github.com/NetchX/Netch/actions)
 [![License](https://img.shields.io/badge/license-MIT-yellow.svg)](LICENSE)
 
-[中文说明](/docs/README.zh-CN.md)
+[文档网站](https://netch.org/) [常见问题](https://netch.org/#/docs/zh-CN/faq) 
 
-[常见问题](https://netch.org/#/docs/zh-CN/faq)
+[中文说明](README.zh-CN.md)
 
 Game network accelerator
 
@@ -31,12 +31,12 @@ Currently supports the following protocols
 - ShadowsocksR
 - Trojan
 - VMess
-- VLess
+- VLESS
 
 As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an NATTypeTester to test out what your NAT type is. When using SSTap to speed up some P2P gaming connections or the game is required for that kind of open NAT type, you may experience some bad situations such as unable to join the game
 
 ## Sponsor
-<a href="https://www.jetbrains.com/?from=Netch"><img src=".github/jetbrains-variant-4.svg" alt="JetBrains" width="200"/></a>
+<a href="https://www.jetbrains.com/?from=Netch"><img src="images/jetbrains-variant-4.svg" alt="JetBrains" width="200"/></a>
 
 - [RabbitHosts](https://rabbithosts.com/cart.php)
 - [ManSora](https://www.mansora.co/cart.php)
@@ -46,27 +46,23 @@ As well, Netch avoid the restricted NAT problem caused by SSTap. You can use an
 - XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
 
 ## Screenshots
-![](docs/screenshots/main.png)
+![](images/screenshots/main.png)
 
 ## Requirements
-- [.NET Framework 4.8 (Included in Windows 10 1903+)](https://dotnet.microsoft.com/download/dotnet-framework/net48)
+- [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0/runtime)
 
 ## Quote
 - [core](https://github.com/aiocloud/core)
 - [aiodns](https://github.com/aiocloud/aiodns)
+- [tun2socks](https://github.com/aiocloud/tun2socks)
 - [Redirector](https://github.com/aiocloud/Redirector)
-- [go-tun2socks](https://github.com/eycorsican/go-tun2socks)
+- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
+- [NetFilter SDK](https://netfiltersdk.com)
+- [pcap2socks](https://github.com/zhxie/pcap2socks)
 - [shadowsocks-libev](https://github.com/shadowsocks/shadowsocks-libev)
 - [shadowsocksr-libev](https://github.com/shadowsocksrr/shadowsocksr-libev)
-- [Xray-core](https://github.com/XTLS/Xray-core)
 - [trojan](https://github.com/trojan-gfw/trojan)
-- [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
-- [PAC](https://github.com/HMBSbige/Text_Translation/blob/master/ShadowsocksR/ss_white.pac)
+- [xray-core](https://github.com/XTLS/Xray-core)
 - [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
-- [tap-windows6](https://github.com/OpenVPN/tap-windows6)
-- [Privoxy](https://www.privoxy.org/)
-- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
-- [NetFilter SDK](https://netfiltersdk.com/)
-- [pcap2socks](https://github.com/zhxie/pcap2socks)
 
 [![Stargazers over time](https://starchart.cc/NetchX/Netch.svg)](https://starchart.cc/NetchX/Netch)     

README.zh-CN.md

@@ -7,9 +7,9 @@
 [![Netch CI](https://github.com/NetchX/Netch/workflows/Netch%20CI/badge.svg)](https://github.com/NetchX/Netch/actions)
 [![License](https://img.shields.io/badge/license-MIT-yellow.svg)](LICENSE)
 
-游戏加速工具
+[文档网站](https://netch.org/) [常见问题](https://netch.org/#/docs/zh-CN/faq)
 
-[网站](https://netch.org/)
+游戏加速工具
 
 ## TOC
 - [Netch](#Netch)
@@ -17,8 +17,6 @@
 	- [简介](#简介)
     - [赞助商](#赞助商)
 	- [捐赠](#捐赠)
-    - [新手入门](Quickstart.zh-CN.md)
-    - [进阶用法](Advanced_Usage.zh-CN.md)
 	- [依赖](#依赖)
     - [语言支持](#语言支持)
 
@@ -31,15 +29,12 @@ Netch 是一款 Windows 平台的开源游戏加速工具，Netch 可以实现
 - ShadowsocksR
 - Trojan
 - VMess
-- VLess
+- VLESS
 
 与此同时 Netch 避免了 SSTap 的 NAT 问题 ，检查 NAT 类型即可知道是否有 NAT 问题。使用 SSTap 加速部分 P2P 联机，对 NAT 类型有要求的游戏时，可能会因为 NAT 类型严格遇到无法加入联机，或者其他影响游戏体验的情况
 
-
-需要更多特性请移步魔改仓库 [Netch-ForOwnUse](https://github.com/AmazingDM/Netch-ForOwnUse)，
-
 ## 赞助商
-<a href="https://www.jetbrains.com/?from=Netch"><img src="../.github/jetbrains-variant-4.svg" alt="JetBrains" width="200"/></a>
+<a href="https://www.jetbrains.com/?from=Netch"><img src="images/jetbrains-variant-4.svg" alt="JetBrains" width="200"/></a>
 
 - [RabbitHosts](https://rabbithosts.com/cart.php)
 - [ManSora](https://www.mansora.co/cart.php)
@@ -48,31 +43,26 @@ Netch 是一款 Windows 平台的开源游戏加速工具，Netch 可以实现
 ## 捐赠
 - XMR *48ju3ELNZEa6wwPBMexCJ9G218BGY2XwhH6B6bmkFuJ3QgM4hPw2Pra35jPtuBZSc7SLNWeBpiWJZWjQeMAiLnTx2tH2Efx*
 
-## 新手入门
-[新手入门教程](Quickstart.zh-CN.md)
-
-## 进阶用法
-[进阶教程](Advanced_Usage.zh-CN.md)
 ## 依赖
-- [.NET Framework 4.8 (Windows 10 1903+ 已包含)](https://dotnet.microsoft.com/download/dotnet-framework/thank-you/net48-offline-installer)
+- [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0/runtime)
 
 ## 语言支持
-Netch 支持多种语言，在启动时会根据系统语言选择自身语言。如果需要手动切换语言，可以在启动时加入命令行参数，命令行参数为目前支持的语言代码，可以去 [NetchTranslation/i18n](https://github.com/NetchX/NetchTranslation/tree/master/i18n) 文件夹下查看外部支持的语言代码文件。Netch 目前内置 en-US，zh-CN，外置 zh-TW。欢迎大家为 [NetchTranslation](https://github.com/NetchX/NetchTranslation) 提供其他语言的翻译
+Netch 内置 en-US 和 zh-CN，外置 zh-TW 等，默认根据系统语言选择语言。
+
+[Netch 外置语言仓库](https://github.com/NetchX/NetchTranslation) ，欢迎提供其他语言的翻译
 
 ## 引用
 - [core](https://github.com/aiocloud/core)
 - [aiodns](https://github.com/aiocloud/aiodns)
+- [tun2socks](https://github.com/aiocloud/tun2socks)
 - [Redirector](https://github.com/aiocloud/Redirector)
-- [go-tun2socks](https://github.com/eycorsican/go-tun2socks)
+- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
+- [NetFilter SDK](https://netfiltersdk.com)
+- [pcap2socks](https://github.com/zhxie/pcap2socks)
 - [shadowsocks-libev](https://github.com/shadowsocks/shadowsocks-libev)
 - [shadowsocksr-libev](https://github.com/shadowsocksrr/shadowsocksr-libev)
-- [Xray-core](https://github.com/XTLS/Xray-core)
 - [trojan](https://github.com/trojan-gfw/trojan)
-- [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
-- [PAC](https://github.com/HMBSbige/Text_Translation/blob/master/ShadowsocksR/ss_white.pac)
+- [xray-core](https://github.com/XTLS/Xray-core)
 - [dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
-- [tap-windows6](https://github.com/OpenVPN/tap-windows6)
-- [Privoxy](https://www.privoxy.org/)
-- [NatTypeTester](https://github.com/HMBSbige/NatTypeTester)
-- [NetFilter SDK](https://netfiltersdk.com/)
-- [pcap2socks](https://github.com/zhxie/pcap2socks)
+
+[![Stargazers over time](https://starchart.cc/NetchX/Netch.svg)](https://starchart.cc/NetchX/Netch)

SearchComboBox/.gitignore

@@ -1,3 +0,0 @@
-/bin
-/obj
-/SearchComboBox.csproj.user