up 6.58

https://github.com/2dust/v2rayN/issues/5646

.github/workflows/build.yml

@@ -36,13 +36,12 @@ jobs:
     #     7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: v2rayN
-        path: 
+        path: |
           .\v2rayN\v2rayN.zip
 
-      
     # - name: Release
     #   uses: softprops/action-gh-release@v1
     #   env:

README.md

@@ -14,7 +14,8 @@ A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core)
 - Run v2rayN.exe
 
 ## Requirements  
-- [Microsoft .NET 6.0 Desktop Runtime ](https://download.visualstudio.microsoft.com/download/pr/513d13b7-b456-45af-828b-b7b7981ff462/edf44a743b78f8b54a2cec97ce888346/windowsdesktop-runtime-6.0.15-win-x64.exe)
+- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 - [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 

v2rayN/PacLib/PacLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

v2rayN/ProtosLib/ProtosLib.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>	  
   </PropertyGroup>
 	
@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.25.1" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.60.0">
+		<PackageReference Include="Google.Protobuf" Version="3.28.0" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.65.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.66.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -0,0 +1,11 @@
+using ReactiveUI;
+
+namespace ServiceLib.Base
+{
+    public class MyReactiveObject : ReactiveObject
+    {
+        protected static Config? _config;
+        protected Func<EViewAction, object?, Task<bool>>? _updateView;
+        protected NoticeHandler? _noticeHandler;
+    }
+}

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -1,17 +1,16 @@
 using Downloader;
-using System.IO;
 using System.Net;
 
-namespace v2rayN.Base
+namespace ServiceLib.Common
 {
-    internal class DownloaderHelper
+    public class DownloaderHelper
     {
         private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
         public static DownloaderHelper Instance => _instance.Value;
 
         public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return null;
             }
@@ -57,7 +56,7 @@ namespace v2rayN.Base
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
@@ -120,11 +119,11 @@ namespace v2rayN.Base
 
         public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 throw new ArgumentNullException(nameof(fileName));
             }
@@ -169,11 +168,15 @@ namespace v2rayN.Base
                     {
                         progress.Report(101);
                     }
+                    else if (value.Error != null)
+                    {
+                        throw value.Error;
+                    }
                 }
             };
 
             using var cts = new CancellationTokenSource();
-            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
+            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token);
 
             downloadOpt = null;
         }

v2rayN/ServiceLib/Common/FileManager.cs

@@ -0,0 +1,161 @@
+using System.IO.Compression;
+using System.Text;
+
+namespace ServiceLib.Common
+{
+    public static class FileManager
+    {
+        public static bool ByteArrayToFile(string fileName, byte[] content)
+        {
+            try
+            {
+                File.WriteAllBytes(fileName, content);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return false;
+        }
+
+        public static void UncompressedFile(string fileName, byte[] content)
+        {
+            try
+            {
+                using FileStream fs = File.Create(fileName);
+                using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
+                input.CopyTo(fs);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public static void UncompressedFile(string fileName, string toPath, string? toName)
+        {
+            try
+            {
+                FileInfo fileInfo = new(fileName);
+                using FileStream originalFileStream = fileInfo.OpenRead();
+                using FileStream decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
+                using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
+                decompressionStream.CopyTo(decompressedFileStream);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public static string NonExclusiveReadAllText(string path)
+        {
+            return NonExclusiveReadAllText(path, Encoding.Default);
+        }
+
+        public static string NonExclusiveReadAllText(string path, Encoding encoding)
+        {
+            try
+            {
+                using FileStream fs = new(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using StreamReader sr = new(fs, encoding);
+                return sr.ReadToEnd();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                throw;
+            }
+        }
+
+        public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
+        {
+            try
+            {
+                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                foreach (ZipArchiveEntry entry in archive.Entries)
+                {
+                    if (entry.Length == 0)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                        {
+                            continue;
+                        }
+                        entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
+                    }
+                    catch (IOException ex)
+                    {
+                        Logging.SaveLog(ex.Message, ex);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
+
+        public static bool CreateFromDirectory(string sourceDirectoryName, string destinationArchiveFileName)
+        {
+            try
+            {
+                if (File.Exists(destinationArchiveFileName))
+                {
+                    File.Delete(destinationArchiveFileName);
+                }
+
+                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName, CompressionLevel.SmallestSize, true);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
+
+        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string ignoredName)
+        {
+            // Get information about the source directory
+            var dir = new DirectoryInfo(sourceDir);
+
+            // Check if the source directory exists
+            if (!dir.Exists)
+                throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+
+            // Cache directories before we start copying
+            DirectoryInfo[] dirs = dir.GetDirectories();
+
+            // Create the destination directory
+            Directory.CreateDirectory(destinationDir);
+
+            // Get the files in the source directory and copy to the destination directory
+            foreach (FileInfo file in dir.GetFiles())
+            {
+                if (!Utils.IsNullOrEmpty(ignoredName) && file.Name.Contains(ignoredName))
+                {
+                    continue;
+                }
+                string targetFilePath = Path.Combine(destinationDir, file.Name);
+                file.CopyTo(targetFilePath);
+            }
+
+            // If recursive and copying subdirectories, recursively call this method
+            if (recursive)
+            {
+                foreach (DirectoryInfo subDir in dirs)
+                {
+                    string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                    CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
+                }
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -1,9 +1,8 @@
-using System.IO;
-using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN.Base
+namespace ServiceLib.Common
 {
     /// <summary>
     /// </summary>
@@ -21,26 +20,57 @@ namespace v2rayN.Base
 
         private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
 
+        public async Task<string?> TryGetAsync(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+                return null;
+
+            try
+            {
+                HttpResponseMessage response = await httpClient.GetAsync(url);
+                return await response.Content.ReadAsStringAsync();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         public async Task<string?> GetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (string.IsNullOrWhiteSpace(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await client.GetStringAsync(url, token);
         }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = Utils.ToJson(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
         }
 
+        public async Task PatchAsync(string url, Dictionary<string, string> headers)
+        {
+            var myContent = JsonUtils.Serialize(headers);
+            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
+            var byteContent = new ByteArrayContent(buffer);
+            byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+            await httpClient.PatchAsync(url, byteContent);
+        }
+
+        public async Task DeleteAsync(string url)
+        {
+            await httpClient.DeleteAsync(url);
+        }
+
         public static async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double>? progress, CancellationToken token = default)
         {
             ArgumentNullException.ThrowIfNull(url);
@@ -76,19 +106,19 @@ namespace v2rayN.Base
                     //if (progressPercentage != percent && percent % 10 == 0)
                     {
                         progressPercentage = percent;
-                        progress!.Report(percent);
+                        progress?.Report(percent);
                     }
                 }
             }
             if (canReportProgress)
             {
-                progress!.Report(101);
+                progress?.Report(101);
             }
         }
 
         public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }

v2rayN/ServiceLib/Common/Job.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace v2rayN
+namespace ServiceLib.Common
 {
     /*
      * See:
@@ -52,7 +52,7 @@ namespace v2rayN
 
             if (!succ)
             {
-                Utils.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
+                Logging.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
             }
 
             return succ;

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -0,0 +1,133 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace ServiceLib.Common
+{
+    public class JsonUtils
+    {
+        /// <summary>
+        /// DeepCopy
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T DeepCopy<T>(T obj)
+        {
+            return Deserialize<T>(Serialize(obj, false))!;
+        }
+
+        /// <summary>
+        /// Deserialize to object
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static T? Deserialize<T>(string? strJson)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(strJson))
+                {
+                    return default;
+                }
+                return JsonSerializer.Deserialize<T>(strJson);
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
+        /// <summary>
+        /// parse
+        /// </summary>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static JsonNode? ParseJson(string strJson)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(strJson))
+                {
+                    return null;
+                }
+                return JsonNode.Parse(strJson);
+            }
+            catch
+            {
+                //SaveLog(ex.Message, ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Serialize Object to Json string
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="indented"></param>
+        /// <returns></returns>
+        public static string Serialize(object? obj, bool indented = true)
+        {
+            string result = string.Empty;
+            try
+            {
+                if (obj == null)
+                {
+                    return result;
+                }
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = indented ? true : false,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                };
+                result = JsonSerializer.Serialize(obj, options);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// SerializeToNode
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
+
+        /// <summary>
+        /// Save as json file
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="filePath"></param>
+        /// <param name="nullValue"></param>
+        /// <returns></returns>
+        public static int ToFile(object? obj, string? filePath, bool nullValue = true)
+        {
+            if (filePath is null)
+            {
+                return -1;
+            }
+            try
+            {
+                using FileStream file = File.Create(filePath);
+
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = true,
+                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                };
+
+                JsonSerializer.Serialize(file, obj, options);
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return -1;
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Common/Logging.cs

@@ -1,9 +1,8 @@
 using NLog;
 using NLog.Config;
 using NLog.Targets;
-using System.IO;
 
-namespace v2rayN.Tool
+namespace ServiceLib.Common
 {
     public class Logging
     {
@@ -51,5 +50,28 @@ namespace v2rayN.Tool
                 catch { }
             });
         }
+
+        public static void SaveLog(string strContent)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
+        }
+
+        public static void SaveLog(string strTitle, Exception ex)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
+            }
+        }
     }
 }

v2rayN/ServiceLib/Common/QRCodeHelper.cs

@@ -0,0 +1,15 @@
+using QRCoder;
+
+namespace ServiceLib.Common
+{
+    public class QRCodeHelper
+    {
+        public static byte[]? GenQRCode(string? url)
+        {
+            using QRCodeGenerator qrGenerator = new();
+            using QRCodeData qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
+            using PngByteQRCode qrCode = new(qrCodeData);
+            return qrCode.GetGraphic(20);
+        }
+    }
+}

v2rayN/ServiceLib/Common/QueryableExtension.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace v2rayN.Tool
+namespace ServiceLib.Common
 {
     public static class QueryableExtension
     {
@@ -29,22 +29,22 @@ namespace v2rayN.Tool
 
         public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderBy(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderBy(_GetLambda<T, TProp>(memberProperty));
         }
 
         public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderByDescending(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderByDescending(_GetLambda<T, TProp>(memberProperty));
         }
 
-        private static Expression<Func<T, TProp>> _GetLamba<T, TProp>(PropertyInfo memberProperty)
+        private static Expression<Func<T, TProp>> _GetLambda<T, TProp>(PropertyInfo memberProperty)
         {
             if (memberProperty.PropertyType != typeof(TProp)) throw new Exception();
 
             var thisArg = Expression.Parameter(typeof(T));
-            var lamba = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
+            var lambda = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
 
-            return lamba;
+            return lambda;
         }
     }
 }

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,6 +1,4 @@
-using v2rayN.Base;
-
-namespace v2rayN.Tool
+namespace ServiceLib.Common
 {
     public class SemanticVersion
     {
@@ -29,7 +27,7 @@ namespace v2rayN.Tool
                     this.minor = int.Parse(parts[1]);
                     this.patch = 0;
                 }
-                else if (parts.Length == 3)
+                else if (parts.Length == 3 || parts.Length == 4)
                 {
                     this.major = int.Parse(parts[0]);
                     this.minor = int.Parse(parts[1]);

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -1,20 +1,21 @@
 using SQLite;
 using System.Collections;
 
-namespace v2rayN.Base
+namespace ServiceLib.Common
 {
-    public sealed class SqliteHelper
+    public sealed class SQLiteHelper
     {
-        private static readonly Lazy<SqliteHelper> _instance = new(() => new());
-        public static SqliteHelper Instance => _instance.Value;
+        private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
+        public static SQLiteHelper Instance => _instance.Value;
         private string _connstr;
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
+        public readonly string _configDB = "guiNDB.db";
 
-        public SqliteHelper()
+        public SQLiteHelper()
         {
-            _connstr = Utils.GetConfigPath(Global.ConfigDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }
@@ -50,7 +51,7 @@ namespace v2rayN.Base
             }
         }
 
-        public async Task<int> Replacesync(object model)
+        public async Task<int> ReplaceAsync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
         }

v2rayN/ServiceLib/Common/StringEx.cs

@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 
-namespace v2rayN.Base
+namespace ServiceLib.Common
 {
-    internal static class StringEx
+    public static class StringEx
     {
         public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
         {
@@ -80,5 +79,15 @@ namespace v2rayN.Base
 
             return char.ToUpper(value[0]) + value.Substring(1);
         }
+
+        public static string AppendQuotes(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return $"\"{value}\"";
+        }
     }
 }

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -0,0 +1,81 @@
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace ServiceLib.Common
+{
+    public class YamlUtils
+    {
+        #region YAML
+
+        /// <summary>
+        /// 反序列化成对象
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static T FromYaml<T>(string str)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            try
+            {
+                T obj = deserializer.Deserialize<T>(str);
+                return obj;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("FromYaml", ex);
+                return deserializer.Deserialize<T>("");
+            }
+        }
+
+        /// <summary>
+        /// 序列化
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string ToYaml(Object? obj)
+        {
+            string result = string.Empty;
+            if (obj == null)
+            {
+                return result;
+            }
+            var serializer = new SerializerBuilder()
+                    .WithNamingConvention(HyphenatedNamingConvention.Instance)
+                    .Build();
+
+            try
+            {
+                result = serializer.Serialize(obj);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return result;
+        }
+
+        public static string? PreprocessYaml(string str)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            try
+            {
+                var mergingParser = new MergingParser(new Parser(new StringReader(str)));
+                var obj = new DeserializerBuilder().Build().Deserialize(mergingParser);
+                return ToYaml(obj);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("PreprocessYaml", ex);
+                return null;
+            }
+        }
+
+        #endregion YAML
+    }
+}

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum EConfigType
     {
@@ -9,6 +9,8 @@
         VLESS = 5,
         Trojan = 6,
         Hysteria2 = 7,
-        Tuic = 8
+        Tuic = 8,
+        Wireguard = 9,
+        Http = 10
     }
 }

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum ECoreType
     {

v2rayN/ServiceLib/Enums/EGirdOrientation.cs

@@ -0,0 +1,9 @@
+namespace ServiceLib.Enums
+{
+    public enum EGirdOrientation
+    {
+        Horizontal,
+        Vertical,
+        Tab,
+    }
+}

v2rayN/ServiceLib/Enums/EGlobalHotkey.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum EGlobalHotkey
     {

v2rayN/ServiceLib/Enums/EInboundProtocol.cs

@@ -0,0 +1,14 @@
+namespace ServiceLib.Enums
+{
+    public enum EInboundProtocol
+    {
+        socks = 0,
+        http,
+        socks2,
+        http2,
+        pac,
+        api,
+        api2,
+        speedtest = 21
+    }
+}

v2rayN/ServiceLib/Enums/EMove.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum EMove
     {

v2rayN/ServiceLib/Enums/ERuleMode.cs

@@ -0,0 +1,10 @@
+namespace ServiceLib.Enums
+{
+    public enum ERuleMode
+    {
+        Rule = 0,
+        Global = 1,
+        Direct = 2,
+        Unchanged = 3
+    }
+}

v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum EServerColName
     {
@@ -7,7 +7,6 @@
         remarks,
         address,
         port,
-        security,
         network,
         streamSecurity,
         subRemarks,

v2rayN/ServiceLib/Enums/ESpeedActionType.cs

@@ -1,8 +1,7 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum ESpeedActionType
     {
-        Ping,
         Tcping,
         Realping,
         Speedtest,

v2rayN/ServiceLib/Enums/ESysProxyType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Enums
 {
     public enum ESysProxyType
     {

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -0,0 +1,15 @@
+namespace ServiceLib.Enums
+{
+    public enum ETransport
+    {
+        tcp,
+        kcp,
+        ws,
+        httpupgrade,
+        splithttp,
+        h2,
+        http,
+        quic,
+        grpc
+    }
+}

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -0,0 +1,45 @@
+namespace ServiceLib.Enums
+{
+    public enum EViewAction
+    {
+        CloseWindow,
+        ShowYesNo,
+        SaveFileDialog,
+        AddBatchRoutingRulesYesNo,
+        AdjustMainLvColWidth,
+        UpdateSysProxy,
+        SetClipboardData,
+        AddServerViaClipboard,
+        ImportRulesFromClipboard,
+        ProfilesFocus,
+        ShareSub,
+        ShareServer,
+        ShowHideWindow,
+        ScanScreenTask,
+        Shutdown,
+        BrowseServer,
+        ImportRulesFromFile,
+        SubEditWindow,
+        RoutingRuleSettingWindow,
+        RoutingRuleDetailsWindow,
+        AddServerWindow,
+        AddServer2Window,
+        DNSSettingWindow,
+        RoutingSettingWindow,
+        OptionSettingWindow,
+        GlobalHotkeySettingWindow,
+        SubSettingWindow,
+        DispatcherSpeedTest,
+        DispatcherRefreshConnections,
+        DispatcherRefreshProxyGroups,
+        DispatcherProxiesDelayTest,
+        DispatcherStatistics,
+        DispatcherServerAvailability,
+        DispatcherReload,
+        DispatcherRefreshServersBiz,
+        DispatcherRefreshIcon,
+        DispatcherCheckUpdate,
+        DispatcherCheckUpdateFinished,
+        DispatcherShowMsg,
+    }
+}

v2rayN/ServiceLib/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>

v2rayN/ServiceLib/Global.cs

@@ -1,16 +1,12 @@
-using v2rayN.Mode;
-
-namespace v2rayN
+namespace ServiceLib
 {
-    internal class Global
+    public class Global
     {
         #region const
 
+        public const string AppName = "v2rayN";
         public const string GithubUrl = "https://github.com";
         public const string GithubApiUrl = "https://api.github.com/repos";
-        public const string V2rayWebsiteUrl = @"https://www.v2fly.org/";
-        public const string AboutUrl = @"https://github.com/2dust/v2rayN";
-        public const string UpdateUrl = AboutUrl + @"/releases";
         public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
         public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
         public const string SagerNetCoreUrl = "https://github.com/SagerNet/v2ray-core/releases";
@@ -23,30 +19,33 @@ namespace v2rayN
         public const string TuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
         public const string SingboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
         public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-        public const string SingboxGeoUrl = "https://github.com/soffchen/sing-{0}/releases/latest/download/{0}.db";
         public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
         public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
+        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
-        public const string ConfigDB = "guiNDB.db";
         public const string CoreConfigFileName = "config.json";
         public const string CorePreConfigFileName = "configPre.json";
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
-        public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
-        public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
-        public const string V2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
-        public const string V2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
-        public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
-        public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
-        public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
-        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
-        public const string TunSingboxDNSFileName = "v2rayN.Sample.tun_singbox_dns";
-        public const string TunSingboxInboundFileName = "v2rayN.Sample.tun_singbox_inbound";
-        public const string TunSingboxRulesFileName = "v2rayN.Sample.tun_singbox_rules";
-        public const string DNSV2rayNormalFileName = "v2rayN.Sample.dns_v2ray_normal";
-        public const string DNSSingboxNormalFileName = "v2rayN.Sample.dns_singbox_normal";
+        public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
+        public const string ClashMixinConfigFileName = "Mixin.yaml";
+        public const string V2raySampleClient = "ServiceLib.Sample.SampleClientConfig";
+        public const string SingboxSampleClient = "ServiceLib.Sample.SingboxSampleClientConfig";
+        public const string V2raySampleHttpRequestFileName = "ServiceLib.Sample.SampleHttpRequest";
+        public const string V2raySampleHttpResponseFileName = "ServiceLib.Sample.SampleHttpResponse";
+        public const string V2raySampleInbound = "ServiceLib.Sample.SampleInbound";
+        public const string V2raySampleOutbound = "ServiceLib.Sample.SampleOutbound";
+        public const string SingboxSampleOutbound = "ServiceLib.Sample.SingboxSampleOutbound";
+        public const string CustomRoutingFileName = "ServiceLib.Sample.custom_routing_";
+        public const string TunSingboxDNSFileName = "ServiceLib.Sample.tun_singbox_dns";
+        public const string TunSingboxInboundFileName = "ServiceLib.Sample.tun_singbox_inbound";
+        public const string TunSingboxRulesFileName = "ServiceLib.Sample.tun_singbox_rules";
+        public const string DNSV2rayNormalFileName = "ServiceLib.Sample.dns_v2ray_normal";
+        public const string DNSSingboxNormalFileName = "ServiceLib.Sample.dns_singbox_normal";
+        public const string ClashMixinYaml = "ServiceLib.Sample.clash_mixin_yaml";
+        public const string ClashTunYaml = "ServiceLib.Sample.clash_tun_yaml";
 
         public const string DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";
@@ -57,28 +56,26 @@ namespace v2rayN
         public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
-        public const string InboundAPIProtocal = "dokodemo-door";
+        public const string InboundAPIProtocol = "dokodemo-door";
         public const string HttpProtocol = "http://";
         public const string HttpsProtocol = "https://";
+        public const string SocksProtocol = "socks://";
 
         public const string UserEMail = "t@t.tt";
-        public const string MyRegPath = "Software\\v2rayNGUI";
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
-        public const string MyRegKeyLanguage = "CurrentLanguage";
         public const string CustomIconName = "v2rayN.ico";
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
         public const string RoutingRuleComma = "<COMMA>";
-        public const string GrpcgunMode = "gun";
-        public const string GrpcmultiMode = "multi";
+        public const string GrpcGunMode = "gun";
+        public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
         public const string CommandClearMsg = "CommandClearMsg";
+        public const string CommandSendMsgView = "CommandSendMsgView";
+        public const string CommandSendSnackMsg = "CommandSendSnackMsg";
+        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
+        public const string CommandRefreshProfiles = "CommandRefreshProfiles";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
@@ -115,11 +112,17 @@ namespace v2rayN
             @"https://speed.cloudflare.com/__down?bytes=100000000",
             @"https://speed.cloudflare.com/__down?bytes=10000000",
             @"http://cachefly.cachefly.net/50mb.test",
-            @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
 
-        public static readonly Dictionary<string, string> UserAgentTxts = new()
+        public static readonly List<string> SpeedPingTestUrls = new() {
+            @"https://www.google.com/generate_204",
+            @"https://www.gstatic.com/generate_204",
+            @"https://www.apple.com/library/test/success.html",
+            @"http://www.msftconnecttest.com/connecttest.txt",
+        };
+
+        public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -138,7 +141,8 @@ namespace v2rayN
             {EConfigType.VLESS,"vless://"},
             {EConfigType.Trojan,"trojan://"},
             {EConfigType.Hysteria2,"hysteria2://"},
-            {EConfigType.Tuic,"tuic://"}
+            {EConfigType.Tuic,"tuic://"},
+            {EConfigType.Wireguard,"wireguard://"}
         };
 
         public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
@@ -146,49 +150,52 @@ namespace v2rayN
             {EConfigType.VMess,"vmess"},
             {EConfigType.Shadowsocks,"shadowsocks"},
             {EConfigType.Socks,"socks"},
+            {EConfigType.Http,"http"},
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
-            {EConfigType.Tuic,"tuic"}
+            {EConfigType.Tuic,"tuic"},
+            {EConfigType.Wireguard,"wireguard"}
         };
 
-        public static readonly List<string> VmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> SsSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> SsSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
-        public static readonly List<string> SsSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> SsSecurities = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SsSecuritiesInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
+        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "splithttp", "h2", "quic", "grpc" };
         public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
         public static readonly List<string> CoreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
         public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
-        public static readonly List<string> DomainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> DomainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
+        public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
         public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
         public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
         public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
 
-        public static readonly List<string> AllowInsecures = new() { "true", "false", "" };
+        public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
+        public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
+        public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
+        public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
-        public static readonly List<string> Alpns = new() { "h2", "http/1.1", "h2,http/1.1", "h3", "" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new() { "9000", "1500" };
+        public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
+        public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
+        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
         public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
+        public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
+        public static readonly List<string> notAllowTestType = new List<string> { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
+        public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
+
         #endregion const
-
-        #region global variable
-
-        public static int StatePort { get; set; }
-        public static Job ProcessJob { get; set; }
-        public static bool ShowInTaskbar { get; set; }
-        public static string ExePathKey { get; set; }
-
-        #endregion global variable
     }
 }

v2rayN/ServiceLib/GlobalUsings.cs

@@ -0,0 +1,9 @@
+global using ServiceLib.Base;
+global using ServiceLib.Common;
+global using ServiceLib.Enums;
+global using ServiceLib.Handler;
+global using ServiceLib.Handler.CoreConfig;
+global using ServiceLib.Handler.Fmt;
+global using ServiceLib.Handler.Statistics;
+global using ServiceLib.Models;
+global using ServiceLib.Resx;

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -0,0 +1,206 @@
+using static ServiceLib.Models.ClashProxies;
+
+namespace ServiceLib.Handler
+{
+    public sealed class ClashApiHandler
+    {
+        private static readonly Lazy<ClashApiHandler> instance = new(() => new());
+        public static ClashApiHandler Instance => instance.Value;
+
+        private Dictionary<String, ProxiesItem>? _proxies;
+        public Dictionary<string, object> ProfileContent { get; set; }
+
+        public void GetClashProxies(Config config, Action<ClashProxies, ClashProviders> update)
+        {
+            Task.Run(() => GetClashProxiesAsync(config, update));
+        }
+
+        private async Task GetClashProxiesAsync(Config config, Action<ClashProxies, ClashProviders> update)
+        {
+            for (var i = 0; i < 5; i++)
+            {
+                var url = $"{GetApiUrl()}/proxies";
+                var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                var clashProxies = JsonUtils.Deserialize<ClashProxies>(result);
+
+                var url2 = $"{GetApiUrl()}/providers/proxies";
+                var result2 = await HttpClientHelper.Instance.TryGetAsync(url2);
+                var clashProviders = JsonUtils.Deserialize<ClashProviders>(result2);
+
+                if (clashProxies != null || clashProviders != null)
+                {
+                    _proxies = clashProxies?.proxies;
+                    update(clashProxies, clashProviders);
+                    return;
+                }
+                Task.Delay(5000).Wait();
+            }
+            update(null, null);
+        }
+
+        public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> update)
+        {
+            Task.Run(() =>
+            {
+                if (blAll)
+                {
+                    for (int i = 0; i < 5; i++)
+                    {
+                        if (_proxies != null)
+                        {
+                            break;
+                        }
+                        Task.Delay(5000).Wait();
+                    }
+                    if (_proxies == null)
+                    {
+                        return;
+                    }
+                    lstProxy = new List<ClashProxyModel>();
+                    foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
+                    {
+                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
+                        {
+                            continue;
+                        }
+                        lstProxy.Add(new ClashProxyModel()
+                        {
+                            name = kv.Value.name,
+                            type = kv.Value.type.ToLower(),
+                        });
+                    }
+                }
+
+                if (lstProxy == null)
+                {
+                    return;
+                }
+                var urlBase = $"{GetApiUrl()}/proxies";
+                urlBase += @"/{0}/delay?timeout=10000&url=" + LazyConfig.Instance.Config.speedTestItem.speedPingTestUrl;
+
+                List<Task> tasks = new List<Task>();
+                foreach (var it in lstProxy)
+                {
+                    if (Global.notAllowTestType.Contains(it.type.ToLower()))
+                    {
+                        continue;
+                    }
+                    var name = it.name;
+                    var url = string.Format(urlBase, name);
+                    tasks.Add(Task.Run(async () =>
+                    {
+                        var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                        update(it, result);
+                    }));
+                }
+                Task.WaitAll(tasks.ToArray());
+
+                Task.Delay(1000).Wait();
+                update(null, "");
+            });
+        }
+
+        public List<ProxiesItem>? GetClashProxyGroups()
+        {
+            try
+            {
+                var fileContent = ProfileContent;
+                if (fileContent is null || fileContent?.ContainsKey("proxy-groups") == false)
+                {
+                    return null;
+                }
+                return JsonUtils.Deserialize<List<ProxiesItem>>(JsonUtils.Serialize(fileContent["proxy-groups"]));
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GetClashProxyGroups", ex);
+                return null;
+            }
+        }
+
+        public async void ClashSetActiveProxy(string name, string nameNode)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/proxies/{name}";
+                Dictionary<string, string> headers = new Dictionary<string, string>();
+                headers.Add("name", nameNode);
+                await HttpClientHelper.Instance.PutAsync(url, headers);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void ClashConfigUpdate(Dictionary<string, string> headers)
+        {
+            Task.Run(async () =>
+            {
+                if (_proxies == null)
+                {
+                    return;
+                }
+
+                var urlBase = $"{GetApiUrl()}/configs";
+
+                await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
+            });
+        }
+
+        public async void ClashConfigReload(string filePath)
+        {
+            ClashConnectionClose("");
+            try
+            {
+                var url = $"{GetApiUrl()}/configs?force=true";
+                Dictionary<string, string> headers = new Dictionary<string, string>();
+                headers.Add("path", filePath);
+                await HttpClientHelper.Instance.PutAsync(url, headers);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void GetClashConnections(Config config, Action<ClashConnections> update)
+        {
+            Task.Run(() => GetClashConnectionsAsync(config, update));
+        }
+
+        private async Task GetClashConnectionsAsync(Config config, Action<ClashConnections> update)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/connections";
+                var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                var clashConnections = JsonUtils.Deserialize<ClashConnections>(result);
+
+                update(clashConnections);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public async void ClashConnectionClose(string id)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/connections/{id}";
+                await HttpClientHelper.Instance.DeleteAsync(url);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private string GetApiUrl()
+        {
+            return $"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort2}";
+        }
+    }
+}

v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigClash.cs

@@ -0,0 +1,271 @@
+namespace ServiceLib.Handler.CoreConfig
+{
+    /// <summary>
+    /// Core configuration file processing class
+    /// </summary>
+    public class CoreConfigClash
+    {
+        private Config _config;
+
+        public CoreConfigClash(Config config)
+        {
+            _config = config;
+        }
+
+        /// <summary>
+        /// 生成配置文件
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="fileName"></param>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        public int GenerateClientCustomConfig(ProfileItem node, string? fileName, out string msg)
+        {
+            if (node == null || fileName is null)
+            {
+                msg = ResUI.CheckServerSettings;
+                return -1;
+            }
+
+            msg = ResUI.InitialConfiguration;
+
+            try
+            {
+                if (node == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                if (File.Exists(fileName))
+                {
+                    File.Delete(fileName);
+                }
+
+                string addressFileName = node.address;
+                if (string.IsNullOrEmpty(addressFileName))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    addressFileName = Path.Combine(Utils.GetConfigPath(), addressFileName);
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    msg = ResUI.FailedReadConfiguration + "1";
+                    return -1;
+                }
+
+                string tagYamlStr1 = "!<str>";
+                string tagYamlStr2 = "__strn__";
+                string tagYamlStr3 = "!!str";
+                var txtFile = File.ReadAllText(addressFileName);
+                txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2);
+
+                //YAML anchors
+                if (txtFile.Contains("<<:") && txtFile.Contains("*") && txtFile.Contains("&"))
+                {
+                    txtFile = YamlUtils.PreprocessYaml(txtFile);
+                }
+
+                var fileContent = YamlUtils.FromYaml<Dictionary<string, object>>(txtFile);
+                if (fileContent == null)
+                {
+                    msg = ResUI.FailedConversionConfiguration;
+                    return -1;
+                }
+
+                //port
+                fileContent["port"] = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
+                //socks-port
+                fileContent["socks-port"] = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
+                //log-level
+                fileContent["log-level"] = GetLogLevel(_config.coreBasicItem.loglevel);
+
+                //external-controller
+                fileContent["external-controller"] = $"{Global.Loopback}:{LazyConfig.Instance.StatePort2}";
+                //allow-lan
+                if (_config.inbound[0].allowLANConn)
+                {
+                    fileContent["allow-lan"] = "true";
+                    fileContent["bind-address"] = "*";
+                }
+                else
+                {
+                    fileContent["allow-lan"] = "false";
+                }
+
+                //ipv6
+                fileContent["ipv6"] = _config.clashUIItem.enableIPv6;
+
+                //mode
+                if (!fileContent.ContainsKey("mode"))
+                {
+                    fileContent["mode"] = ERuleMode.Rule.ToString().ToLower();
+                }
+                else
+                {
+                    if (_config.clashUIItem.ruleMode != ERuleMode.Unchanged)
+                    {
+                        fileContent["mode"] = _config.clashUIItem.ruleMode.ToString().ToLower();
+                    }
+                }
+
+                //enable tun mode
+                if (_config.tunModeItem.enableTun)
+                {
+                    string tun = Utils.GetEmbedText(Global.ClashTunYaml);
+                    if (!string.IsNullOrEmpty(tun))
+                    {
+                        var tunContent = YamlUtils.FromYaml<Dictionary<string, object>>(tun);
+                        if (tunContent != null)
+                            fileContent["tun"] = tunContent["tun"];
+                    }
+                }
+
+                //Mixin
+                try
+                {
+                    MixinContent(fileContent, node);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("GenerateClientConfigClash-Mixin", ex);
+                }
+
+                var txtFileNew = YamlUtils.ToYaml(fileContent).Replace(tagYamlStr2, tagYamlStr3);
+                File.WriteAllText(fileName, txtFileNew);
+                //check again
+                if (!File.Exists(fileName))
+                {
+                    msg = ResUI.FailedReadConfiguration + "2";
+                    return -1;
+                }
+
+                ClashApiHandler.Instance.ProfileContent = fileContent;
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, $"{node.GetSummary()}");
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GenerateClientConfigClash", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
+        private void MixinContent(Dictionary<string, object> fileContent, ProfileItem node)
+        {
+            //if (!_config.clashUIItem.enableMixinContent)
+            //{
+            //    return;
+            //}
+
+            var path = Utils.GetConfigPath(Global.ClashMixinConfigFileName);
+            if (!File.Exists(path))
+            {
+                return;
+            }
+
+            var txtFile = File.ReadAllText(Utils.GetConfigPath(Global.ClashMixinConfigFileName));
+
+            var mixinContent = YamlUtils.FromYaml<Dictionary<string, object>>(txtFile);
+            if (mixinContent == null)
+            {
+                return;
+            }
+            foreach (var item in mixinContent)
+            {
+                if (!_config.tunModeItem.enableTun && item.Key == "tun")
+                {
+                    continue;
+                }
+
+                if (item.Key.StartsWith("prepend-")
+                    || item.Key.StartsWith("append-")
+                    || item.Key.StartsWith("removed-"))
+                {
+                    ModifyContentMerge(fileContent, item.Key, item.Value);
+                }
+                else
+                {
+                    fileContent[item.Key] = item.Value;
+                }
+            }
+            return;
+        }
+
+        private void ModifyContentMerge(Dictionary<string, object> fileContent, string key, object value)
+        {
+            bool blPrepend = false;
+            bool blRemoved = false;
+            if (key.StartsWith("prepend-"))
+            {
+                blPrepend = true;
+                key = key.Replace("prepend-", "");
+            }
+            else if (key.StartsWith("append-"))
+            {
+                blPrepend = false;
+                key = key.Replace("append-", "");
+            }
+            else if (key.StartsWith("removed-"))
+            {
+                blRemoved = true;
+                key = key.Replace("removed-", "");
+            }
+            else
+            {
+                return;
+            }
+
+            if (!blRemoved && !fileContent.ContainsKey(key))
+            {
+                fileContent.Add(key, value);
+                return;
+            }
+            var lstOri = (List<object>)fileContent[key];
+            var lstValue = (List<object>)value;
+
+            if (blRemoved)
+            {
+                foreach (var item in lstValue)
+                {
+                    lstOri.RemoveAll(t => t.ToString().StartsWith(item.ToString()));
+                }
+                return;
+            }
+
+            if (blPrepend)
+            {
+                lstValue.Reverse();
+                foreach (var item in lstValue)
+                {
+                    lstOri.Insert(0, item);
+                }
+            }
+            else
+            {
+                foreach (var item in lstValue)
+                {
+                    lstOri.Add(item);
+                }
+            }
+        }
+
+        private string GetLogLevel(string level)
+        {
+            if (level == "none")
+            {
+                return "silent";
+            }
+            else
+            {
+                return level;
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigHandler.cs

@@ -1,13 +1,9 @@
-using System.IO;
-using v2rayN.Mode;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler
+namespace ServiceLib.Handler.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
     /// </summary>
-    internal class CoreConfigHandler
+    public class CoreConfigHandler
     {
         public static int GenerateClientConfig(ProfileItem node, string? fileName, out string msg, out string content)
         {
@@ -19,14 +15,27 @@ namespace v2rayN.Handler
                     msg = ResUI.CheckServerSettings;
                     return -1;
                 }
-                var config = LazyConfig.Instance.GetConfig();
+                var config = LazyConfig.Instance.Config;
 
                 msg = ResUI.InitialConfiguration;
                 if (node.configType == EConfigType.Custom)
                 {
-                    return GenerateClientCustomConfig(node, fileName, out msg);
+                    if (node.coreType is ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
+                    {
+                        var configGenClash = new CoreConfigClash(config);
+                        return configGenClash.GenerateClientCustomConfig(node, fileName, out msg);
+                    }
+                    if (node.coreType is ECoreType.sing_box)
+                    {
+                        var configGenSingbox = new CoreConfigSingbox(config);
+                        return configGenSingbox.GenerateClientCustomConfig(node, fileName, out msg);
+                    }
+                    else
+                    {
+                        return GenerateClientCustomConfig(node, fileName, out msg);
+                    }
                 }
-                else if (config.tunModeItem.enableTun || LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
+                else if (LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
                 {
                     var configGenSingbox = new CoreConfigSingbox(config);
                     if (configGenSingbox.GenerateClientConfigContent(node, out SingboxConfig? singboxConfig, out msg) != 0)
@@ -35,11 +44,11 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(singboxConfig);
+                        content = JsonUtils.Serialize(singboxConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(singboxConfig, fileName, false);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -51,17 +60,17 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(v2rayConfig);
+                        content = JsonUtils.Serialize(v2rayConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToFile(v2rayConfig, fileName, false);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig", ex);
+                Logging.SaveLog("GenerateClientConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -104,46 +113,11 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                //overwrite port
-                if (node.preSocksPort <= 0)
-                {
-                    var fileContent = File.ReadAllLines(fileName).ToList();
-                    var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-                    switch (coreType)
-                    {
-                        case ECoreType.v2fly:
-                        case ECoreType.SagerNet:
-                        case ECoreType.Xray:
-                        case ECoreType.v2fly_v5:
-                            break;
-
-                        case ECoreType.clash:
-                        case ECoreType.clash_meta:
-                        case ECoreType.mihomo:
-                            //remove the original
-                            var indexPort = fileContent.FindIndex(t => t.Contains("port:"));
-                            if (indexPort >= 0)
-                            {
-                                fileContent.RemoveAt(indexPort);
-                            }
-                            indexPort = fileContent.FindIndex(t => t.Contains("socks-port:"));
-                            if (indexPort >= 0)
-                            {
-                                fileContent.RemoveAt(indexPort);
-                            }
-
-                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}");
-                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}");
-                            break;
-                    }
-                    File.WriteAllLines(fileName, fileContent);
-                }
-
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientCustomConfig", ex);
+                Logging.SaveLog("GenerateClientCustomConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -154,22 +128,44 @@ namespace v2rayN.Handler
         {
             if (coreType == ECoreType.sing_box)
             {
-                if ((new CoreConfigSingbox(config)).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                if (new CoreConfigSingbox(config).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
                 {
                     return -1;
                 }
-                Utils.ToJsonFile(singboxConfig, fileName, false);
+                JsonUtils.ToFile(singboxConfig, fileName, false);
             }
             else
             {
-                if ((new CoreConfigV2ray(config)).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                if (new CoreConfigV2ray(config).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
                 {
                     return -1;
                 }
-
-                Utils.ToJsonFile(v2rayConfig, fileName, false);
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
             }
             return 0;
         }
+
+        public static int GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType, out string msg)
+        {
+            msg = ResUI.CheckServerSettings;
+            if (coreType == ECoreType.sing_box)
+            {
+                if (new CoreConfigSingbox(config).GenerateClientMultipleLoadConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(singboxConfig, fileName, false);
+            }
+            else if (coreType == ECoreType.Xray)
+            {
+                if (new CoreConfigV2ray(config).GenerateClientMultipleLoadConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
+            }
+
+            return 0;
+        }
     }
 }

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -1,16 +1,12 @@
 using System.Diagnostics;
-using System.IO;
-using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Mode;
-using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
     /// <summary>
     /// Core process processing class
     /// </summary>
-    internal class CoreHandler
+    public class CoreHandler
     {
         private Config _config;
         private Process? _process;
@@ -26,9 +22,8 @@ namespace v2rayN.Handler
             Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         }
 
-        public void LoadCore()
+        public void LoadCore(ProfileItem? node)
         {
-            var node = ConfigHandler.GetDefaultServer(_config);
             if (node == null)
             {
                 ShowMsg(false, ResUI.CheckServerSettings);
@@ -39,6 +34,7 @@ namespace v2rayN.Handler
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
+                return;
             }
             else
             {
@@ -48,29 +44,29 @@ namespace v2rayN.Handler
                 CoreStart(node);
 
                 //In tun mode, do a delay check and restart the core
-                if (_config.tunModeItem.enableTun)
-                {
-                    Observable.Range(1, 1)
-                    .Delay(TimeSpan.FromSeconds(15))
-                    .Subscribe(x =>
-                    {
-                        {
-                            if (_process == null || _process.HasExited)
-                            {
-                                CoreStart(node);
-                                ShowMsg(false, "Tun mode restart the core once");
-                                Utils.SaveLog("Tun mode restart the core once");
-                            }
-                        }
-                    });
-                }
+                //if (_config.tunModeItem.enableTun)
+                //{
+                //    Observable.Range(1, 1)
+                //    .Delay(TimeSpan.FromSeconds(15))
+                //    .Subscribe(x =>
+                //    {
+                //        {
+                //            if (_process == null || _process.HasExited)
+                //            {
+                //                CoreStart(node);
+                //                ShowMsg(false, "Tun mode restart the core once");
+                //                Logging.SaveLog("Tun mode restart the core once");
+                //            }
+                //        }
+                //    });
+                //}
             }
         }
 
         public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
             int pid = -1;
-            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic) ? ECoreType.sing_box : ECoreType.Xray;
+            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
             string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
             if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
@@ -107,8 +103,8 @@ namespace v2rayN.Handler
 
                 if (!hasProc)
                 {
-                    var coreInfos = LazyConfig.Instance.GetCoreInfos();
-                    foreach (var it in coreInfos)
+                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+                    foreach (var it in coreInfo)
                     {
                         if (it.coreType == ECoreType.v2rayN)
                         {
@@ -120,7 +116,7 @@ namespace v2rayN.Handler
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
-                                if (path == $"{Utils.GetBinPath(vName, it.coreType)}.exe")
+                                if (path == Utils.GetExeName(Utils.GetBinPath(vName, it.coreType.ToString())))
                                 {
                                     KillProcess(p);
                                 }
@@ -131,7 +127,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -144,17 +140,19 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
-        private string CoreFindexe(CoreInfo coreInfo)
+        #region Private
+
+        private string CoreFindExe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
             foreach (string name in coreInfo.coreExes)
             {
-                string vName = $"{name}.exe";
-                vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                string vName = Utils.GetExeName(name);
+                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
@@ -163,8 +161,8 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
-                Utils.SaveLog(msg);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -172,44 +170,65 @@ namespace v2rayN.Handler
 
         private void CoreStart(ProfileItem node)
         {
+            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
-            ECoreType coreType;
-            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            {
-                coreType = ECoreType.sing_box;
-            }
-            else
-            {
-                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            }
-            var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+            //ECoreType coreType;
+            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
+            //{
+            //    coreType = ECoreType.sing_box;
+            //}
+            //else
+            //{
+            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            //}
+            var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            _config.runningCoreType = coreType;
+            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
 
             var displayLog = node.configType != EConfigType.Custom || node.displayLog;
-            var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg);
+            var proc = RunProcess(node, coreInfo, "", displayLog);
             if (proc is null)
             {
                 return;
             }
             _process = proc;
 
-            //start a socks service
+            //start a pre service
             if (_process != null && !_process.HasExited)
             {
-                if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                ProfileItem? itemSocks = null;
+                var preCoreType = ECoreType.sing_box;
+                if (node.configType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.tunModeItem.enableTun)
                 {
-                    var itemSocks = new ProfileItem()
+                    itemSocks = new ProfileItem()
                     {
-                        coreType = ECoreType.sing_box,
+                        coreType = preCoreType,
                         configType = EConfigType.Socks,
                         address = Global.Loopback,
-                        port = node.preSocksPort
+                        sni = node.address, //Tun2SocksAddress
+                        port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)
                     };
+                }
+                else if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                {
+                    preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
+                    itemSocks = new ProfileItem()
+                    {
+                        coreType = preCoreType,
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        port = node.preSocksPort.Value,
+                    };
+                    _config.runningCoreType = preCoreType;
+                }
+                if (itemSocks != null)
+                {
                     string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
                     if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
                     {
-                        var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
-                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true, ShowMsg);
+                        var coreInfo2 = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
                         if (proc2 is not null)
                         {
                             _processPre = proc2;
@@ -226,8 +245,8 @@ namespace v2rayN.Handler
             ShowMsg(false, configPath);
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
+                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
                 if (proc is null)
                 {
                     return -1;
@@ -237,25 +256,27 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(false, msg);
                 return -1;
             }
         }
 
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
+        private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(updateToTrayTooltip, msg);
+            _updateFunc(notify, msg);
         }
 
+        #endregion Private
+
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
         {
             try
             {
-                string fileName = CoreFindexe(coreInfo);
+                string fileName = CoreFindExe(coreInfo);
                 if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
@@ -275,22 +296,29 @@ namespace v2rayN.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
                         }
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
+
+                            if (!startUpSuccessful)
+                            {
+                                startUpErrorMessage.Append(msg);
+                            }
                         }
                     };
                 }
@@ -303,17 +331,22 @@ namespace v2rayN.Handler
 
                 if (proc.WaitForExit(1000))
                 {
-                    throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    proc.CancelErrorRead();
+                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+                else
+                {
+                    startUpSuccessful = true;
                 }
 
-                Global.ProcessJob.AddProcess(proc.Handle);
+                LazyConfig.Instance.AddProcess(proc.Handle);
                 return proc;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
@@ -326,7 +359,7 @@ namespace v2rayN.Handler
             }
             try
             {
-                proc.CloseMainWindow();
+                proc.Kill();
                 proc.WaitForExit(100);
                 if (!proc.HasExited)
                 {
@@ -336,7 +369,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -0,0 +1,217 @@
+using System.Runtime.Intrinsics.X86;
+
+namespace ServiceLib.Handler
+{
+    public sealed class CoreInfoHandler
+    {
+        private static readonly Lazy<CoreInfoHandler> _instance = new(() => new());
+        private List<CoreInfo>? _coreInfo;
+        public static CoreInfoHandler Instance => _instance.Value;
+
+        public CoreInfoHandler()
+        {
+            InitCoreInfo();
+        }
+
+        public CoreInfo? GetCoreInfo(ECoreType coreType)
+        {
+            if (_coreInfo == null)
+            {
+                InitCoreInfo();
+            }
+            return _coreInfo?.FirstOrDefault(t => t.coreType == coreType);
+        }
+
+        public List<CoreInfo> GetCoreInfo()
+        {
+            if (_coreInfo == null)
+            {
+                InitCoreInfo();
+            }
+            return _coreInfo ?? [];
+        }
+
+        private void InitCoreInfo()
+        {
+            _coreInfo = [];
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.v2rayN,
+                coreUrl = Global.NUrl,
+                coreReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.NUrl + "/download/{0}/v2rayN-32.zip",
+                coreDownloadUrl64 = Global.NUrl + "/download/{0}/v2rayN.zip",
+                coreDownloadUrlArm64 = Global.NUrl + "/download/{0}/v2rayN-arm64.zip",
+                coreDownloadUrlLinux32 = Global.NUrl + "/download/{0}/v2rayN-linux-32.zip",
+                coreDownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
+                coreDownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.v2fly,
+                coreExes = new List<string> { "wv2ray", "v2ray" },
+                arguments = "",
+                coreUrl = Global.V2flyCoreUrl,
+                coreReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "V2Ray",
+                versionArg = "-version",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.SagerNet,
+                coreExes = new List<string> { "SagerNet", "v2ray" },
+                arguments = "run",
+                coreUrl = Global.SagerNetCoreUrl,
+                coreReleaseApiUrl = Global.SagerNetCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "V2Ray",
+                versionArg = "version",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.v2fly_v5,
+                coreExes = new List<string> { "v2ray" },
+                arguments = "run -c config.json -format jsonv5",
+                coreUrl = Global.V2flyCoreUrl,
+                coreReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "V2Ray",
+                versionArg = "version",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.Xray,
+                coreExes = new List<string> { "xray", "wxray" },
+                arguments = "run {0}",
+                coreUrl = Global.XrayCoreUrl,
+                coreReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-32.zip",
+                coreDownloadUrl64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
+                coreDownloadUrlArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
+                coreDownloadUrlLinux32 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-32.zip",
+                coreDownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
+                coreDownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
+                match = "Xray",
+                versionArg = "-version",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.clash,
+                coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
+                arguments = "-f config.json" + PortableMode(),
+                coreUrl = Global.ClashCoreUrl,
+                coreReleaseApiUrl = Global.ClashCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "v",
+                versionArg = "-v",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.clash_meta,
+                coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
+                arguments = "-f config.json" + PortableMode(),
+                coreUrl = Global.ClashMetaCoreUrl,
+                coreReleaseApiUrl = Global.ClashMetaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "v",
+                versionArg = "-v",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.mihomo,
+                coreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
+                arguments = "-f config.json" + PortableMode(),
+                coreUrl = Global.MihomoCoreUrl,
+                coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
+                coreDownloadUrlLinux32 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-386-{0}.gz",
+                coreDownloadUrlLinux64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                coreDownloadUrlLinuxArm64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
+                match = "Mihomo",
+                versionArg = "-v",
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.hysteria,
+                coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                arguments = "",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.naiveproxy,
+                coreExes = new List<string> { "naiveproxy", "naive" },
+                arguments = "config.json",
+                coreUrl = Global.NaiveproxyCoreUrl,
+                redirectInfo = false,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.tuic,
+                coreExes = new List<string> { "tuic-client", "tuic" },
+                arguments = "-c config.json",
+                coreUrl = Global.TuicCoreUrl,
+                redirectInfo = true,
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.sing_box,
+                coreExes = new List<string> { "sing-box-client", "sing-box" },
+                arguments = "run {0} --disable-color",
+                coreUrl = Global.SingboxCoreUrl,
+                redirectInfo = true,
+                coreReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-386.zip",
+                coreDownloadUrl64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
+                coreDownloadUrlArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                coreDownloadUrlLinux32 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-386.tar.gz",
+                coreDownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
+                coreDownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
+                match = "sing-box",
+                versionArg = "version",
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.juicity,
+                coreExes = new List<string> { "juicity-client", "juicity" },
+                arguments = "run -c config.json",
+                coreUrl = Global.JuicityCoreUrl
+            });
+
+            _coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.hysteria2,
+                coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                arguments = "",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                redirectInfo = true,
+            });
+        }
+
+        private string PortableMode()
+        {
+            return $" -d \"{Utils.GetBinPath("")}\"";
+        }
+    }
+}

v2rayN/ServiceLib/Handler/DownloadHandler.cs

@@ -1,18 +1,14 @@
 using System.Diagnostics;
-using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
-using v2rayN.Base;
-using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
     /// <summary>
     ///Download
     /// </summary>
-    internal class DownloadHandle
+    public class DownloadHandler
     {
         public event EventHandler<ResultEventArgs>? UpdateCompleted;
 
@@ -34,7 +30,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.Config.guiItem.enableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
@@ -62,11 +58,11 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        public async Task DownloadFileAsync(string url, bool blProxy, int downloadTimeout)
+        public async Task DownloadFileAsync(string url, string fileName, bool blProxy, int downloadTimeout)
         {
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.Config.guiItem.enableSecurityProtocolTls13);
                 UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
@@ -78,13 +74,13 @@ namespace v2rayN.Handler
                 var webProxy = GetWebProxy(blProxy);
                 await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
-                    Utils.GetTempPath(Utils.GetDownloadFileName(url)),
+                    fileName,
                     progress,
                     downloadTimeout);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
@@ -96,7 +92,7 @@ namespace v2rayN.Handler
 
         public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
-            Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+            Utils.SetSecurityProtocol(LazyConfig.Instance.Config.guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
@@ -111,7 +107,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                Utils.SaveLog("StatusCode error: " + url);
+                Logging.SaveLog("StatusCode error: " + url);
                 return null;
             }
         }
@@ -128,7 +124,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -146,7 +142,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -166,7 +162,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -185,7 +181,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.Config.guiItem.enableSecurityProtocolTls13);
                 var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
@@ -212,7 +208,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -230,7 +226,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.Config.guiItem.enableSecurityProtocolTls13);
 
                 var webProxy = GetWebProxy(blProxy);
 
@@ -243,7 +239,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -264,19 +260,19 @@ namespace v2rayN.Handler
 
                 try
                 {
-                    var config = LazyConfig.Instance.GetConfig();
+                    var config = LazyConfig.Instance.Config;
                     int responseTime = await GetRealPingTime(config.speedTestItem.speedPingTestUrl, webProxy, 10);
                     return responseTime;
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                     return -1;
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return -1;
             }
         }
@@ -286,8 +282,6 @@ namespace v2rayN.Handler
             int responseTime = -1;
             try
             {
-                Stopwatch timer = Stopwatch.StartNew();
-
                 using var cts = new CancellationTokenSource();
                 cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
                 using var client = new HttpClient(new SocketsHttpHandler()
@@ -295,13 +289,21 @@ namespace v2rayN.Handler
                     Proxy = webProxy,
                     UseProxy = webProxy != null
                 });
-                await client.GetAsync(url, cts.Token);
 
-                responseTime = timer.Elapsed.Milliseconds;
+                List<int> oneTime = [];
+                for (int i = 0; i < 2; i++)
+                {
+                    var timer = Stopwatch.StartNew();
+                    await client.GetAsync(url, cts.Token);
+                    timer.Stop();
+                    oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
+                    await Task.Delay(100);
+                }
+                responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
-                //Utils.SaveLog(ex.Message, ex);
+                //Utile.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
@@ -312,7 +314,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+            var httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
             if (!SocketCheck(Global.Loopback, httpPort))
             {
                 return null;

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -0,0 +1,205 @@
+using System.Collections.Specialized;
+
+namespace ServiceLib.Handler.Fmt
+{
+    public class BaseFmt
+    {
+        protected static string GetIpv6(string address)
+        {
+            if (Utils.IsIpv6(address))
+            {
+                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+            }
+            return address;  // 如果不是IPv6地址，直接返回原地址
+        }
+
+        protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+        {
+            if (!Utils.IsNullOrEmpty(item.flow))
+            {
+                dicQuery.Add("flow", item.flow);
+            }
+
+            if (!Utils.IsNullOrEmpty(item.streamSecurity))
+            {
+                dicQuery.Add("security", item.streamSecurity);
+            }
+            else
+            {
+                if (securityDef != null)
+                {
+                    dicQuery.Add("security", securityDef);
+                }
+            }
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.fingerprint))
+            {
+                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+            }
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+            }
+            if (!Utils.IsNullOrEmpty(item.spiderX))
+            {
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+            }
+            if (item.allowInsecure.Equals("true"))
+            {
+                dicQuery.Add("allowInsecure", "1");
+            }
+
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
+
+            switch (item.network)
+            {
+                case nameof(ETransport.tcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    break;
+
+                case nameof(ETransport.kcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                case nameof(ETransport.splithttp):
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    dicQuery["type"] = nameof(ETransport.http);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case nameof(ETransport.quic):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
+                    dicQuery.Add("key", Utils.UrlEncode(item.path));
+                    break;
+
+                case nameof(ETransport.grpc):
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
+                        dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
+                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
+                        {
+                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
+                        }
+                    }
+                    break;
+            }
+            return 0;
+        }
+
+        protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
+        {
+            item.flow = query["flow"] ?? "";
+            item.streamSecurity = query["security"] ?? "";
+            item.sni = query["sni"] ?? "";
+            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
+            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+            item.allowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
+
+            item.network = query["type"] ?? nameof(ETransport.tcp);
+            switch (item.network)
+            {
+                case nameof(ETransport.tcp):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+
+                    break;
+
+                case nameof(ETransport.kcp):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.path = Utils.UrlDecode(query["seed"] ?? "");
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                case nameof(ETransport.splithttp):
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.path = Utils.UrlDecode(query["path"] ?? "/");
+                    break;
+
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    item.network = nameof(ETransport.h2);
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.path = Utils.UrlDecode(query["path"] ?? "/");
+                    break;
+
+                case nameof(ETransport.quic):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.requestHost = query["quicSecurity"] ?? Global.None;
+                    item.path = Utils.UrlDecode(query["key"] ?? "");
+                    break;
+
+                case nameof(ETransport.grpc):
+                    item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
+                    item.path = Utils.UrlDecode(query["serviceName"] ?? "");
+                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
+                    break;
+
+                default:
+                    break;
+            }
+            return 0;
+        }
+
+        protected static bool Contains(string str, params string[] s)
+        {
+            foreach (var item in s)
+            {
+                if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
+            }
+            return false;
+        }
+
+        protected static string WriteAllText(string strData, string ext = "json")
+        {
+            var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.{ext}");
+            File.WriteAllText(fileName, strData);
+            return fileName;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -0,0 +1,23 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class ClashFmt : BaseFmt
+    {
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "port", "socks-port", "proxies"))
+            {
+                var fileName = WriteAllText(strData, "yaml");
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.mihomo,
+                    address = fileName,
+                    remarks = subRemarks ?? "clash_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -0,0 +1,90 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class FmtHandler
+    {
+        public static string? GetShareUri(ProfileItem item)
+        {
+            try
+            {
+                var url = item.configType switch
+                {
+                    EConfigType.VMess => VmessFmt.ToUri(item),
+                    EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
+                    EConfigType.Socks => SocksFmt.ToUri(item),
+                    EConfigType.Trojan => TrojanFmt.ToUri(item),
+                    EConfigType.VLESS => VLESSFmt.ToUri(item),
+                    EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
+                    EConfigType.Tuic => TuicFmt.ToUri(item),
+                    EConfigType.Wireguard => WireguardFmt.ToUri(item),
+                    _ => null,
+                };
+
+                return url;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return "";
+            }
+        }
+
+        public static ProfileItem? ResolveConfig(string config, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            try
+            {
+                string str = config.TrimEx();
+                if (Utils.IsNullOrEmpty(str))
+                {
+                    msg = ResUI.FailedReadConfiguration;
+                    return null;
+                }
+
+                if (str.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
+                {
+                    return VmessFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
+                {
+                    return ShadowsocksFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
+                {
+                    return SocksFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
+                {
+                    return TrojanFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
+                {
+                    return VLESSFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
+                {
+                    return Hysteria2Fmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+                {
+                    return TuicFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                {
+                    return WireguardFmt.Resolve(str, out msg);
+                }
+                else
+                {
+                    msg = ResUI.NonvmessOrssProtocol;
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                msg = ResUI.Incorrectconfiguration;
+                return null;
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -0,0 +1,100 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class Hysteria2Fmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Hysteria2
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
+            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
+            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
+            return url;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "server", "up", "down", "listen", "<html>", "<body>"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.hysteria,
+                    address = fileName,
+                    remarks = subRemarks ?? "hysteria_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "server", "auth", "up", "down", "listen"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.hysteria2,
+                    address = fileName,
+                    remarks = subRemarks ?? "hysteria2_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs

@@ -0,0 +1,23 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class NaiveproxyFmt : BaseFmt
+    {
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "listen", "proxy", "<html>", "<body>"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.naiveproxy,
+                    address = fileName,
+                    remarks = subRemarks ?? "naiveproxy_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -0,0 +1,180 @@
+using System.Text.RegularExpressions;
+
+namespace ServiceLib.Handler.Fmt
+{
+    public class ShadowsocksFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+
+            item = ResolveSSLegacy(str) ?? ResolveSip002(str);
+            if (item == null)
+            {
+                return null;
+            }
+            if (item.address.Length == 0 || item.port == 0 || item.security.Length == 0 || item.id.Length == 0)
+            {
+                return null;
+            }
+
+            item.configType = EConfigType.Shadowsocks;
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            //url = string.Format("{0}:{1}@{2}:{3}",
+            //    item.security,
+            //    item.id,
+            //    item.address,
+            //    item.port);
+            //url = Utile.Base64Encode(url);
+            //new Sip002
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+            url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
+            return url;
+        }
+
+        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+        private static ProfileItem? ResolveSSLegacy(string result)
+        {
+            var match = UrlFinder.Match(result);
+            if (!match.Success)
+                return null;
+
+            ProfileItem item = new();
+            var base64 = match.Groups["base64"].Value.TrimEnd('/');
+            var tag = match.Groups["tag"].Value;
+            if (!Utils.IsNullOrEmpty(tag))
+            {
+                item.remarks = Utils.UrlDecode(tag);
+            }
+            Match details;
+            try
+            {
+                details = DetailsParser.Match(Utils.Base64Decode(base64));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            if (!details.Success)
+                return null;
+            item.security = details.Groups["method"].Value;
+            item.id = details.Groups["password"].Value;
+            item.address = details.Groups["hostname"].Value;
+            item.port = Utils.ToInt(details.Groups["port"].Value);
+            return item;
+        }
+
+        private static ProfileItem? ResolveSip002(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            ProfileItem item = new()
+            {
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
+            //2022-blake3
+            if (rawUserInfo.Contains(':'))
+            {
+                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+                if (userInfoParts.Length != 2)
+                {
+                    return null;
+                }
+                item.security = userInfoParts[0];
+                item.id = Utils.UrlDecode(userInfoParts[1]);
+            }
+            else
+            {
+                // parse base64 UserInfo
+                string userInfo = Utils.Base64Decode(rawUserInfo);
+                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+                if (userInfoParts.Length != 2)
+                {
+                    return null;
+                }
+                item.security = userInfoParts[0];
+                item.id = userInfoParts[1];
+            }
+
+            var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
+            if (queryParameters["plugin"] != null)
+            {
+                //obfs-host exists
+                var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
+                if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
+                {
+                    obfsHost = obfsHost?.Replace("obfs-host=", "");
+                    item.network = Global.DefaultNetwork;
+                    item.headerType = Global.TcpHeaderHttp;
+                    item.requestHost = obfsHost ?? "";
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+            return item;
+        }
+
+        public static List<ProfileItem>? ResolveSip008(string result)
+        {
+            //SsSIP008
+            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
+            if (lstSsServer?.Count <= 0)
+            {
+                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
+                if (ssSIP008?.servers?.Count > 0)
+                {
+                    lstSsServer = ssSIP008.servers;
+                }
+            }
+
+            if (lstSsServer?.Count > 0)
+            {
+                List<ProfileItem> lst = [];
+                foreach (var it in lstSsServer)
+                {
+                    var ssItem = new ProfileItem()
+                    {
+                        remarks = it.remarks,
+                        security = it.method,
+                        id = it.password,
+                        address = it.server,
+                        port = Utils.ToInt(it.server_port)
+                    };
+                    lst.Add(ssItem);
+                }
+                return lst;
+            }
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -0,0 +1,55 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class SingboxFmt : BaseFmt
+    {
+        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        {
+            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
+            if (configObjects != null && configObjects.Length > 0)
+            {
+                List<ProfileItem> lstResult = [];
+                foreach (var configObject in configObjects)
+                {
+                    var objectString = JsonUtils.Serialize(configObject);
+                    var singboxCon = JsonUtils.Deserialize<SingboxConfig>(objectString);
+                    if (singboxCon?.inbounds?.Count > 0
+                        && singboxCon.outbounds?.Count > 0
+                        && singboxCon.route != null)
+                    {
+                        var fileName = WriteAllText(objectString);
+
+                        var profileIt = new ProfileItem
+                        {
+                            coreType = ECoreType.sing_box,
+                            address = fileName,
+                            remarks = subRemarks ?? "singbox_custom",
+                        };
+                        lstResult.Add(profileIt);
+                    }
+                }
+                return lstResult;
+            }
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(strData);
+            if (singboxConfig?.inbounds?.Count > 0
+                && singboxConfig.outbounds?.Count > 0
+                && singboxConfig.route != null)
+            {
+                var fileName = WriteAllText(strData);
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.sing_box,
+                    address = fileName,
+                    remarks = subRemarks ?? "singbox_custom"
+                };
+
+                return profileItem;
+            }
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -0,0 +1,127 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class SocksFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+
+            item = ResolveSocksNew(str) ?? ResolveSocks(str);
+            if (item == null)
+            {
+                return null;
+            }
+            if (item.address.Length == 0 || item.port == 0)
+            {
+                return null;
+            }
+
+            item.configType = EConfigType.Socks;
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            //url = string.Format("{0}:{1}@{2}:{3}",
+            //    item.security,
+            //    item.id,
+            //    item.address,
+            //    item.port);
+            //url = Utile.Base64Encode(url);
+            //new
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+            url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
+            return url;
+        }
+
+        private static ProfileItem? ResolveSocks(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Socks
+            };
+            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
+            //remark
+            int indexRemark = result.IndexOf("#");
+            if (indexRemark > 0)
+            {
+                try
+                {
+                    item.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+                }
+                catch { }
+                result = result[..indexRemark];
+            }
+            //part decode
+            int indexS = result.IndexOf("@");
+            if (indexS > 0)
+            {
+            }
+            else
+            {
+                result = Utils.Base64Decode(result);
+            }
+
+            string[] arr1 = result.Split('@');
+            if (arr1.Length != 2)
+            {
+                return null;
+            }
+            string[] arr21 = arr1[0].Split(':');
+            //string[] arr22 = arr1[1].Split(':');
+            int indexPort = arr1[1].LastIndexOf(":");
+            if (arr21.Length != 2 || indexPort < 0)
+            {
+                return null;
+            }
+            item.address = arr1[1][..indexPort];
+            item.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+            item.security = arr21[0];
+            item.id = arr21[1];
+
+            return item;
+        }
+
+        private static ProfileItem? ResolveSocksNew(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            ProfileItem item = new()
+            {
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+
+            // parse base64 UserInfo
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+            string userInfo = Utils.Base64Decode(rawUserInfo);
+            string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.security = userInfoParts[0];
+                item.id = userInfoParts[1];
+            }
+
+            return item;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -0,0 +1,49 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class TrojanFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Trojan
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            GetStdTransport(item, null, ref dicQuery);
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -0,0 +1,64 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class TuicFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Tuic
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.id = userInfoParts[0];
+                item.security = userInfoParts[1];
+            }
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.headerType = query["congestion_control"] ?? "";
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("congestion_control", item.headerType);
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            $"{item.id}:{item.security}",
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -0,0 +1,56 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class V2rayFmt : BaseFmt
+    {
+        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        {
+            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
+            if (configObjects != null && configObjects.Length > 0)
+            {
+                List<ProfileItem> lstResult = [];
+                foreach (var configObject in configObjects)
+                {
+                    var objectString = JsonUtils.Serialize(configObject);
+                    var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
+                    if (v2rayCon?.inbounds?.Count > 0
+                        && v2rayCon.outbounds?.Count > 0
+                        && v2rayCon.routing != null)
+                    {
+                        var fileName = WriteAllText(objectString);
+
+                        var profileIt = new ProfileItem
+                        {
+                            coreType = ECoreType.Xray,
+                            address = fileName,
+                            remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
+                        };
+                        lstResult.Add(profileIt);
+                    }
+                }
+                return lstResult;
+            }
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(strData);
+            if (v2rayConfig?.inbounds?.Count > 0
+                && v2rayConfig.outbounds?.Count > 0
+                && v2rayConfig.routing != null)
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.Xray,
+                    address = fileName,
+                    remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
+                };
+
+                return profileItem;
+            }
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -0,0 +1,60 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class VLESSFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VLESS,
+                security = Global.None
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            item.security = query["encryption"] ?? Global.None;
+            item.streamSecurity = query["security"] ?? "";
+            ResolveStdTransport(query, ref item);
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.security))
+            {
+                dicQuery.Add("encryption", item.security);
+            }
+            else
+            {
+                dicQuery.Add("encryption", Global.None);
+            }
+            GetStdTransport(item, Global.None, ref dicQuery);
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -0,0 +1,122 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class VmessFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+            if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
+            {
+                item = ResolveStdVmess(str);
+            }
+            else
+            {
+                item = ResolveVmess(str, out msg);
+            }
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            VmessQRCode vmessQRCode = new()
+            {
+                v = item.configVersion,
+                ps = item.remarks.TrimEx(),
+                add = item.address,
+                port = item.port,
+                id = item.id,
+                aid = item.alterId,
+                scy = item.security,
+                net = item.network,
+                type = item.headerType,
+                host = item.requestHost,
+                path = item.path,
+                tls = item.streamSecurity,
+                sni = item.sni,
+                alpn = item.alpn,
+                fp = item.fingerprint
+            };
+
+            url = JsonUtils.Serialize(vmessQRCode);
+            url = Utils.Base64Encode(url);
+            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
+
+            return url;
+        }
+
+        private static ProfileItem? ResolveVmess(string result, out string msg)
+        {
+            msg = string.Empty;
+            var item = new ProfileItem
+            {
+                configType = EConfigType.VMess
+            };
+
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+            result = Utils.Base64Decode(result);
+
+            //转成Json
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
+            if (vmessQRCode == null)
+            {
+                msg = ResUI.FailedConversionConfiguration;
+                return null;
+            }
+
+            item.network = Global.DefaultNetwork;
+            item.headerType = Global.None;
+
+            item.configVersion = Utils.ToInt(vmessQRCode.v);
+            item.remarks = Utils.ToString(vmessQRCode.ps);
+            item.address = Utils.ToString(vmessQRCode.add);
+            item.port = Utils.ToInt(vmessQRCode.port);
+            item.id = Utils.ToString(vmessQRCode.id);
+            item.alterId = Utils.ToInt(vmessQRCode.aid);
+            item.security = Utils.ToString(vmessQRCode.scy);
+
+            item.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+            {
+                item.network = vmessQRCode.net;
+            }
+            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+            {
+                item.headerType = vmessQRCode.type;
+            }
+
+            item.requestHost = Utils.ToString(vmessQRCode.host);
+            item.path = Utils.ToString(vmessQRCode.path);
+            item.streamSecurity = Utils.ToString(vmessQRCode.tls);
+            item.sni = Utils.ToString(vmessQRCode.sni);
+            item.alpn = Utils.ToString(vmessQRCode.alpn);
+            item.fingerprint = Utils.ToString(vmessQRCode.fp);
+
+            return item;
+        }
+
+        public static ProfileItem? ResolveStdVmess(string str)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VMess,
+                security = "auto"
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+
+            return item;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -0,0 +1,69 @@
+namespace ServiceLib.Handler.Fmt
+{
+    public class WireguardFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Wireguard
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+
+            item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+            item.path = Utils.UrlDecode(query["reserved"] ?? "");
+            item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+            item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/LazyConfig.cs

@@ -0,0 +1,242 @@
+namespace ServiceLib.Handler
+{
+    public sealed class LazyConfig
+    {
+        private static readonly Lazy<LazyConfig> _instance = new(() => new());
+        private Config _config;
+        private int? _statePort;
+        private int? _statePort2;
+
+        public static LazyConfig Instance => _instance.Value;
+        public Config Config => _config;
+
+        public int StatePort
+        {
+            get
+            {
+                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
+                return _statePort.Value;
+            }
+        }
+
+        public int StatePort2
+        {
+            get
+            {
+                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
+                return _statePort2.Value;
+            }
+        }
+
+        private Job? _processJob;
+
+        public LazyConfig()
+        {
+            SQLiteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
+        }
+
+        #region Config
+
+        public void SetConfig(Config config) => _config = config;
+
+        public int GetLocalPort(EInboundProtocol protocol)
+        {
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
+            return localPort + (int)protocol;
+        }
+
+        public void AddProcess(IntPtr processHandle)
+        {
+            if (Utils.IsWindows())
+            {
+                _processJob ??= new();
+                _processJob?.AddProcess(processHandle);
+            }
+        }
+
+        #endregion Config
+
+        #region SqliteHelper
+
+        public List<SubItem> SubItems()
+        {
+            return SQLiteHelper.Instance.Table<SubItem>().ToList();
+        }
+
+        public SubItem GetSubItem(string subid)
+        {
+            return SQLiteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
+        }
+
+        public List<ProfileItem> ProfileItems(string subid)
+        {
+            if (Utils.IsNullOrEmpty(subid))
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
+            }
+            else
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
+            }
+        }
+
+        public List<string> ProfileItemIndexes(string subid)
+        {
+            if (Utils.IsNullOrEmpty(subid))
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+            }
+            else
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
+            }
+        }
+
+        public List<ProfileItemModel> ProfileItems(string subid, string filter)
+        {
+            var sql = @$"select a.*
+                           ,b.remarks subRemarks
+                        from ProfileItem a
+                        left join SubItem b on a.subid = b.id
+                        where 1=1 ";
+            if (!Utils.IsNullOrEmpty(subid))
+            {
+                sql += $" and a.subid = '{subid}'";
+            }
+            if (!Utils.IsNullOrEmpty(filter))
+            {
+                if (filter.Contains('\''))
+                {
+                    filter = filter.Replace("'", "");
+                }
+                sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
+            }
+
+            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+        }
+
+        public List<ProfileItemModel> ProfileItemsEx(string subid, string filter)
+        {
+            var lstModel = ProfileItems(_config.subIndexId, filter);
+
+            ConfigHandler.SetDefaultServer(_config, lstModel);
+
+            var lstServerStat = (_config.guiItem.enableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
+            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
+            lstModel = (from t in lstModel
+                        join t2 in lstServerStat on t.indexId equals t2.indexId into t2b
+                        from t22 in t2b.DefaultIfEmpty()
+                        join t3 in lstProfileExs on t.indexId equals t3.indexId into t3b
+                        from t33 in t3b.DefaultIfEmpty()
+                        select new ProfileItemModel
+                        {
+                            indexId = t.indexId,
+                            configType = t.configType,
+                            remarks = t.remarks,
+                            address = t.address,
+                            port = t.port,
+                            security = t.security,
+                            network = t.network,
+                            streamSecurity = t.streamSecurity,
+                            subid = t.subid,
+                            subRemarks = t.subRemarks,
+                            isActive = t.indexId == _config.indexId,
+                            sort = t33 == null ? 0 : t33.sort,
+                            delay = t33 == null ? 0 : t33.delay,
+                            delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
+                            speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
+                            todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
+                            todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
+                            totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
+                            totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
+                        }).OrderBy(t => t.sort).ToList();
+
+            return lstModel;
+        }
+
+        public ProfileItem? GetProfileItem(string indexId)
+        {
+            if (Utils.IsNullOrEmpty(indexId))
+            {
+                return null;
+            }
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+        }
+
+        public ProfileItem? GetProfileItemViaRemarks(string remarks)
+        {
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                return null;
+            }
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
+        }
+
+        public List<RoutingItem> RoutingItems()
+        {
+            return SQLiteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
+        }
+
+        public RoutingItem GetRoutingItem(string id)
+        {
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+        }
+
+        public List<DNSItem> DNSItems()
+        {
+            return SQLiteHelper.Instance.Table<DNSItem>().ToList();
+        }
+
+        public DNSItem GetDNSItem(ECoreType eCoreType)
+        {
+            return SQLiteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
+        }
+
+        #endregion SqliteHelper
+
+        #region Core Type
+
+        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
+        {
+            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
+            switch (coreType)
+            {
+                case ECoreType.v2fly:
+                    return Global.SsSecurities;
+
+                case ECoreType.Xray:
+                    return Global.SsSecuritiesInXray;
+
+                case ECoreType.sing_box:
+                    return Global.SsSecuritiesInSingbox;
+            }
+            return Global.SsSecuritiesInSagerNet;
+        }
+
+        public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
+        {
+            if (profileItem?.coreType != null)
+            {
+                return (ECoreType)profileItem.coreType;
+            }
+
+            if (_config.coreTypeItem == null)
+            {
+                return ECoreType.Xray;
+            }
+            var item = _config.coreTypeItem.FirstOrDefault(it => it.configType == eConfigType);
+            if (item == null)
+            {
+                return ECoreType.Xray;
+            }
+            return item.coreType;
+        }
+
+        #endregion Core Type
+    }
+}

v2rayN/ServiceLib/Handler/NoticeHandler.cs

@@ -0,0 +1,41 @@
+using ReactiveUI;
+
+namespace ServiceLib.Handler
+{
+    public class NoticeHandler
+    {
+        public void Enqueue(string? content)
+        {
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
+            MessageBus.Current.SendMessage(content, Global.CommandSendSnackMsg);
+        }
+
+        public void SendMessage(string? content)
+        {
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
+            MessageBus.Current.SendMessage(content, Global.CommandSendMsgView);
+        }
+
+        public void SendMessageEx(string? content)
+        {
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
+            content = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} {content}";
+            SendMessage(content);
+        }
+
+        public void SendMessageAndEnqueue(string? msg)
+        {
+            Enqueue(msg);
+            SendMessage(msg);
+        }
+    }
+}

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -1,14 +1,13 @@
 using System.Collections.Concurrent;
-using System.Reactive.Linq;
-using v2rayN.Base;
-using v2rayN.Mode;
 
-namespace v2rayN.Handler
+//using System.Reactive.Linq;
+
+namespace ServiceLib.Handler
 {
-    internal class ProfileExHandler
+    public class ProfileExHandler
     {
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
-        private ConcurrentBag<ProfileExItem> _lstProfileEx;
+        private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
         private Queue<string> _queIndexIds = new();
         public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
         public static ProfileExHandler Instance => _instance.Value;
@@ -16,33 +15,24 @@ namespace v2rayN.Handler
         public ProfileExHandler()
         {
             Init();
-        }
-
-        private void Init()
-        {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
-
-            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
 
             Task.Run(async () =>
             {
                 while (true)
                 {
-                    var cnt = _queIndexIds.Count;
-                    for (int i = 0; i < cnt; i++)
-                    {
-                        var id = _queIndexIds.Dequeue();
-                        var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
-                        if (item is not null)
-                        {
-                            SqliteHelper.Instance.Replace(item);
-                        }
-                    }
-                    await Task.Delay(1000 * 60);
+                    SaveQueueIndexIds();
+                    await Task.Delay(1000 * 600);
                 }
             });
         }
 
+        private void Init()
+        {
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+
+            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
+        }
+
         private void IndexIdEnqueue(string indexId)
         {
             if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
@@ -51,6 +41,49 @@ namespace v2rayN.Handler
             }
         }
 
+        private void SaveQueueIndexIds()
+        {
+            var cnt = _queIndexIds.Count;
+            if (cnt > 0)
+            {
+                var lstExists = SQLiteHelper.Instance.Table<ProfileExItem>();
+                List<ProfileExItem> lstInserts = [];
+                List<ProfileExItem> lstUpdates = [];
+
+                for (int i = 0; i < cnt; i++)
+                {
+                    var id = _queIndexIds.Dequeue();
+                    var item = lstExists.FirstOrDefault(t => t.indexId == id);
+                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.indexId == id);
+                    if (itemNew is null)
+                    {
+                        continue;
+                    }
+
+                    if (item is not null)
+                    {
+                        lstUpdates.Add(itemNew);
+                    }
+                    else
+                    {
+                        lstInserts.Add(itemNew);
+                    }
+                }
+                try
+                {
+                    if (lstInserts.Count() > 0)
+                        SQLiteHelper.Instance.InsertAll(lstInserts);
+
+                    if (lstUpdates.Count() > 0)
+                        SQLiteHelper.Instance.UpdateAll(lstUpdates);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ProfileExHandler", ex);
+                }
+            }
+        }
+
         private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
         {
             profileEx = new()
@@ -66,7 +99,7 @@ namespace v2rayN.Handler
 
         public void ClearAll()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem ");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
             _lstProfileEx = new();
         }
 
@@ -74,15 +107,11 @@ namespace v2rayN.Handler
         {
             try
             {
-                //foreach (var item in _lstProfileEx)
-                //{
-                //    SqliteHelper.Instance.Replace(item);
-                //}
-                SqliteHelper.Instance.UpdateAll(_lstProfileEx);
+                SaveQueueIndexIds();
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 

v2rayN/ServiceLib/Handler/SpeedtestHandler.cs

@@ -1,26 +1,19 @@
 using System.Diagnostics;
 using System.Net;
-using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using v2rayN.Mode;
-using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
-    internal class SpeedtestHandler
+    public class SpeedtestHandler
     {
-        private Config _config;
+        private Config? _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
         private ESpeedActionType _actionType;
-        private Action<string, string, string> _updateFunc;
+        private Action<SpeedTestResult> _updateFunc;
+        private bool _exitLoop = false;
 
-        public SpeedtestHandler(Config config)
-        {
-            _config = config;
-        }
-
-        public SpeedtestHandler(Config config, CoreHandler coreHandler, List<ProfileItem> selecteds, ESpeedActionType actionType, Action<string, string, string> update)
+        public SpeedtestHandler(Config config, CoreHandler coreHandler, List<ProfileItem> selecteds, ESpeedActionType actionType, Action<SpeedTestResult> update)
         {
             _config = config;
             _coreHandler = coreHandler;
@@ -51,7 +44,6 @@ namespace v2rayN.Handler
             {
                 switch (actionType)
                 {
-                    case ESpeedActionType.Ping:
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
@@ -73,10 +65,6 @@ namespace v2rayN.Handler
 
             switch (actionType)
             {
-                case ESpeedActionType.Ping:
-                    Task.Run(RunPing);
-                    break;
-
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
@@ -95,52 +83,51 @@ namespace v2rayN.Handler
             }
         }
 
-        private async Task RunPingSubAsync(Action<ServerTestItem> updateFun)
+        public void ExitLoop()
+        {
+            _exitLoop = true;
+            UpdateFunc("", ResUI.SpeedtestingStop);
+        }
+
+        private Task RunTcping()
         {
             try
             {
-                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
+                List<Task> tasks = [];
+                foreach (var it in _selecteds)
                 {
-                    try
+                    if (it.configType == EConfigType.Custom)
                     {
-                        Task.Run(() => updateFun(it));
+                        continue;
                     }
-                    catch (Exception ex)
+                    tasks.Add(Task.Run(() =>
                     {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                }
+                        try
+                        {
+                            int time = GetTcpingTime(it.address, it.port);
+                            var output = FormatOut(time, Global.DelayUnit);
 
-                await Task.Delay(10);
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            UpdateFunc(it.indexId, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll([.. tasks]);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
-        }
-
-        private async void RunPing()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
-             {
-                 long time = Ping(it.address);
-                 var output = FormatOut(time, Global.DelayUnit);
-
-                 ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                 UpdateFunc(it.indexId, output);
-             });
-        }
-
-        private async void RunTcping()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
+            finally
             {
-                int time = GetTcpingTime(it.address, it.port);
-                var output = FormatOut(time, Global.DelayUnit);
+                ProfileExHandler.Instance.SaveTo();
+            }
 
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
-            });
+            return Task.CompletedTask;
         }
 
         private Task RunRealPing()
@@ -157,7 +144,7 @@ namespace v2rayN.Handler
                     return Task.CompletedTask;
                 }
 
-                DownloadHandle downloadHandle = new DownloadHandle();
+                DownloadHandler downloadHandle = new DownloadHandler();
 
                 List<Task> tasks = new();
                 foreach (var it in _selecteds)
@@ -184,7 +171,7 @@ namespace v2rayN.Handler
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            Logging.SaveLog(ex.Message, ex);
                         }
                     }));
                 }
@@ -192,7 +179,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -224,10 +211,15 @@ namespace v2rayN.Handler
             string url = _config.speedTestItem.speedTestUrl;
             var timeout = _config.speedTestItem.speedTestTimeout;
 
-            DownloadHandle downloadHandle = new();
+            DownloadHandler downloadHandle = new();
 
             foreach (var it in _selecteds)
             {
+                if (_exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
                 if (!it.allowTest)
                 {
                     continue;
@@ -281,10 +273,16 @@ namespace v2rayN.Handler
             string url = _config.speedTestItem.speedTestUrl;
             var timeout = _config.speedTestItem.speedTestTimeout;
 
-            DownloadHandle downloadHandle = new();
+            DownloadHandler downloadHandle = new();
 
             foreach (var it in _selecteds)
             {
+                if (_exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+
                 if (!it.allowTest)
                 {
                     continue;
@@ -336,10 +334,10 @@ namespace v2rayN.Handler
             await RunSpeedTestMulti();
         }
 
-        public async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
+        private async Task<string> GetRealPingTime(DownloadHandler downloadHandle, IWebProxy webProxy)
         {
             int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
-            //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
+            //string output = Utile.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
             return FormatOut(responseTime, Global.DelayUnit);
         }
 
@@ -349,70 +347,32 @@ namespace v2rayN.Handler
 
             try
             {
-                if (!IPAddress.TryParse(url, out IPAddress ipAddress))
+                if (!IPAddress.TryParse(url, out IPAddress? ipAddress))
                 {
                     IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
                     ipAddress = ipHostInfo.AddressList[0];
                 }
 
-                Stopwatch timer = new();
-                timer.Start();
+                var timer = Stopwatch.StartNew();
 
                 IPEndPoint endPoint = new(ipAddress, port);
                 using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
-                IAsyncResult result = clientSocket.BeginConnect(endPoint, null, null);
+                var result = clientSocket.BeginConnect(endPoint, null, null);
                 if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
                     throw new TimeoutException("connect timeout (5s): " + url);
                 clientSocket.EndConnect(result);
 
                 timer.Stop();
-                responseTime = timer.Elapsed.Milliseconds;
+                responseTime = (int)timer.Elapsed.TotalMilliseconds;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
 
-        /// <summary>
-        /// Ping
-        /// </summary>
-        /// <param name="host"></param>
-        /// <returns></returns>
-        public long Ping(string host)
-        {
-            long roundtripTime = -1;
-            try
-            {
-                int timeout = 30;
-                int echoNum = 2;
-                using Ping pingSender = new();
-                for (int i = 0; i < echoNum; i++)
-                {
-                    PingReply reply = pingSender.Send(host, timeout);
-                    if (reply.Status == IPStatus.Success)
-                    {
-                        if (reply.RoundtripTime < 0)
-                        {
-                            continue;
-                        }
-                        if (roundtripTime < 0 || reply.RoundtripTime < roundtripTime)
-                        {
-                            roundtripTime = reply.RoundtripTime;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return -1;
-            }
-            return roundtripTime;
-        }
-
         private string FormatOut(object time, string unit)
         {
             //if (time.ToString().Equals("-1"))
@@ -424,7 +384,7 @@ namespace v2rayN.Handler
 
         private void UpdateFunc(string indexId, string delay, string speed = "")
         {
-            _updateFunc(indexId, delay, speed);
+            _updateFunc(new() { IndexId = indexId, Delay = delay, Speed = speed });
         }
     }
 }

v2rayN/ServiceLib/Handler/Statistics/StatisticsHandler.cs

@@ -1,12 +1,10 @@
-using System.Net;
-using System.Net.Sockets;
-using v2rayN.Base;
-using v2rayN.Mode;
-
-namespace v2rayN.Handler
+namespace ServiceLib.Handler.Statistics
 {
-    internal class StatisticsHandler
+    public class StatisticsHandler
     {
+        private static readonly Lazy<StatisticsHandler> instance = new(() => new());
+        public static StatisticsHandler Instance => instance.Value;
+
         private Config _config;
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
@@ -15,21 +13,17 @@ namespace v2rayN.Handler
         private StatisticsSingbox? _statisticsSingbox;
 
         public List<ServerStatItem> ServerStat => _lstServerStat;
-        public bool Enable { get; set; }
 
-        public StatisticsHandler(Config config, Action<ServerSpeedItem> update)
+        public void Init(Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
-            Enable = config.guiItem.enableStatistics;
-            if (!Enable)
+            _updateFunc = update;
+            if (!config.guiItem.enableStatistics)
             {
                 return;
             }
 
-            _updateFunc = update;
-
-            Init();
-            Global.StatePort = GetFreePort();
+            InitData();
 
             _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
             _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
@@ -44,13 +38,13 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
         public void ClearAllServerStatistics()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem ");
             _serverStatItem = null;
             _lstServerStat = new();
         }
@@ -59,28 +53,35 @@ namespace v2rayN.Handler
         {
             try
             {
-                SqliteHelper.Instance.UpdateAll(_lstServerStat);
+                if (_lstServerStat != null)
+                {
+                    SQLiteHelper.Instance.UpdateAll(_lstServerStat);
+                }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
-        private void Init()
+        private void InitData()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
 
             long ticks = DateTime.Now.Date.Ticks;
-            SqliteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+            SQLiteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
 
-            _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
+            _lstServerStat = SQLiteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
         private void UpdateServerStat(ServerSpeedItem server)
         {
             GetServerStatItem(_config.indexId);
 
+            if (_serverStatItem is null)
+            {
+                return;
+            }
             if (server.proxyUp != 0 || server.proxyDown != 0)
             {
                 _serverStatItem.todayUp += server.proxyUp;
@@ -88,15 +89,13 @@ namespace v2rayN.Handler
                 _serverStatItem.totalUp += server.proxyUp;
                 _serverStatItem.totalDown += server.proxyDown;
             }
-            if (Global.ShowInTaskbar)
-            {
-                server.indexId = _config.indexId;
-                server.todayUp = _serverStatItem.todayUp;
-                server.todayDown = _serverStatItem.todayDown;
-                server.totalUp = _serverStatItem.totalUp;
-                server.totalDown = _serverStatItem.totalDown;
-                _updateFunc(server);
-            }
+
+            server.indexId = _config.indexId;
+            server.todayUp = _serverStatItem.todayUp;
+            server.todayDown = _serverStatItem.todayDown;
+            server.totalUp = _serverStatItem.totalUp;
+            server.totalDown = _serverStatItem.totalDown;
+            _updateFunc(server);
         }
 
         private void GetServerStatItem(string indexId)
@@ -121,7 +120,7 @@ namespace v2rayN.Handler
                         todayDown = 0,
                         dateNow = ticks
                     };
-                    SqliteHelper.Instance.Replace(_serverStatItem);
+                    SQLiteHelper.Instance.Replace(_serverStatItem);
                     _lstServerStat.Add(_serverStatItem);
                 }
             }
@@ -133,27 +132,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        private int GetFreePort()
-        {
-            try
-            {
-                int defaultPort = 9090;
-                if (!Utils.PortInUse(defaultPort))
-                {
-                    return defaultPort;
-                }
-
-                TcpListener l = new(IPAddress.Loopback, 0);
-                l.Start();
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                l.Stop();
-                return port;
-            }
-            catch
-            {
-            }
-            return 69090;
-        }
     }
 }

v2rayN/ServiceLib/Handler/Statistics/StatisticsSingbox.cs

@@ -1,10 +1,9 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Mode;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler.Statistics
 {
-    internal class StatisticsSingbox
+    public class StatisticsSingbox
     {
         private Config _config;
         private bool _exitFlag;
@@ -27,7 +26,7 @@ namespace v2rayN.Handler
 
             try
             {
-                url = $"ws://{Global.Loopback}:{Global.StatePort}/traffic";
+                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort2}/traffic";
 
                 if (webSocket == null)
                 {
@@ -51,7 +50,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -61,8 +60,13 @@ namespace v2rayN.Handler
 
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
+                    if (!(_config.IsRunningCore(ECoreType.clash)))
+                    {
+                        continue;
+                    }
                     if (webSocket != null)
                     {
                         if (webSocket.State == WebSocketState.Aborted
@@ -84,7 +88,7 @@ namespace v2rayN.Handler
                         while (!res.CloseStatus.HasValue)
                         {
                             var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
-                            if (!string.IsNullOrEmpty(result))
+                            if (!Utils.IsNullOrEmpty(result))
                             {
                                 ParseOutput(result, out ulong up, out ulong down);
 
@@ -101,10 +105,6 @@ namespace v2rayN.Handler
                 catch
                 {
                 }
-                finally
-                {
-                    await Task.Delay(1000);
-                }
             }
         }
 
@@ -113,7 +113,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = Utils.FromJson<TrafficItem>(source);
+                var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;

v2rayN/ServiceLib/Handler/Statistics/StatisticsV2ray.cs

@@ -1,19 +1,18 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Mode;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler.Statistics
 {
-    internal class StatisticsV2ray
+    public class StatisticsV2ray
     {
-        private Mode.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Mode.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -30,12 +29,12 @@ namespace v2rayN.Handler
             {
                 try
                 {
-                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{Global.StatePort}");
+                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort}");
                     _client = new StatsService.StatsServiceClient(_channel);
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                 }
             }
         }
@@ -49,14 +48,20 @@ namespace v2rayN.Handler
         {
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
+                    if (!(_config.IsRunningCore(ECoreType.Xray)))
+                    {
+                        continue;
+                    }
                     if (_channel?.State == ConnectivityState.Ready)
                     {
                         QueryStatsResponse? res = null;
                         try
                         {
-                            res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
+                            if (_client != null)
+                                res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
                         }
                         catch
                         {
@@ -68,8 +73,8 @@ namespace v2rayN.Handler
                             _updateFunc(server);
                         }
                     }
-                    await Task.Delay(1000);
-                    await _channel.ConnectAsync();
+                    if (_channel != null)
+                        await _channel.ConnectAsync();
                 }
                 catch
                 {
@@ -80,6 +85,8 @@ namespace v2rayN.Handler
         private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
         {
             server = new();
+            long aggregateProxyUp = 0;
+            long aggregateProxyDown = 0;
             try
             {
                 foreach (Stat stat in source)
@@ -94,15 +101,15 @@ namespace v2rayN.Handler
                     name = nStr[1];
                     type = nStr[3];
 
-                    if (name == Global.ProxyTag)
+                    if (name.StartsWith(Global.ProxyTag))
                     {
                         if (type == "uplink")
                         {
-                            server.proxyUp = value;
+                            aggregateProxyUp += value;
                         }
                         else if (type == "downlink")
                         {
-                            server.proxyDown = value;
+                            aggregateProxyDown += value;
                         }
                     }
                     else if (name == Global.DirectTag)
@@ -117,6 +124,8 @@ namespace v2rayN.Handler
                         }
                     }
                 }
+                server.proxyUp = aggregateProxyUp;
+                server.proxyDown = aggregateProxyDown;
             }
             catch
             {

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -0,0 +1,76 @@
+namespace ServiceLib.Handler
+{
+    public class TaskHandler
+    {
+        private static readonly Lazy<TaskHandler> _instance = new(() => new());
+        public static TaskHandler Instance => _instance.Value;
+
+        public TaskHandler()
+        {
+        }
+
+        public void RegUpdateTask(Config config, Action<bool, string> update)
+        {
+            Task.Run(() => UpdateTaskRunSubscription(config, update));
+            Task.Run(() => UpdateTaskRunGeo(config, update));
+        }
+
+        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
+        {
+            await Task.Delay(60000);
+            Logging.SaveLog("UpdateTaskRunSubscription");
+
+            var updateHandle = new UpdateHandler();
+            while (true)
+            {
+                var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
+                var lstSubs = LazyConfig.Instance.SubItems()
+                            .Where(t => t.autoUpdateInterval > 0)
+                            .Where(t => updateTime - t.updateTime >= t.autoUpdateInterval * 60)
+                            .ToList();
+
+                foreach (var item in lstSubs)
+                {
+                    updateHandle.UpdateSubscriptionProcess(config, item.id, true, (bool success, string msg) =>
+                    {
+                        update(success, msg);
+                        if (success)
+                            Logging.SaveLog("subscription" + msg);
+                    });
+                    item.updateTime = updateTime;
+                    ConfigHandler.AddSubItem(config, item);
+
+                    await Task.Delay(5000);
+                }
+                await Task.Delay(60000);
+            }
+        }
+
+        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> update)
+        {
+            var autoUpdateGeoTime = DateTime.Now;
+
+            await Task.Delay(1000 * 120);
+            Logging.SaveLog("UpdateTaskRunGeo");
+
+            var updateHandle = new UpdateHandler();
+            while (true)
+            {
+                var dtNow = DateTime.Now;
+                if (config.guiItem.autoUpdateInterval > 0)
+                {
+                    if ((dtNow - autoUpdateGeoTime).Hours % config.guiItem.autoUpdateInterval == 0)
+                    {
+                        await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
+                        {
+                            update(false, msg);
+                        });
+                        autoUpdateGeoTime = dtNow;
+                    }
+                }
+
+                await Task.Delay(1000 * 3600);
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Handler/UpdateHandler.cs

@@ -1,26 +1,17 @@
-using DynamicData;
-using Splat;
-using System.Diagnostics;
-using System.IO;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Windows;
-using v2rayN.Base;
-using v2rayN.Mode;
-using v2rayN.Resx;
-using v2rayN.Tool;
 
-namespace v2rayN.Handler
+namespace ServiceLib.Handler
 {
-    internal class UpdateHandle
+    public class UpdateHandler
     {
         private Action<bool, string> _updateFunc;
         private Config _config;
+        private int _timeout = 30;
 
-        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
-
-        public class ResultEventArgs : EventArgs
+        private class ResultEventArgs
         {
             public bool Success;
             public string Msg;
@@ -34,37 +25,66 @@ namespace v2rayN.Handler
             }
         }
 
-        public void CheckUpdateGuiN(Config config, Action<bool, string> update, bool preRelease)
+        public async Task CheckUpdateGuiN(Config config, Action<bool, string> update, bool preRelease)
         {
             _config = config;
             _updateFunc = update;
             var url = string.Empty;
+            var fileName = string.Empty;
 
-            DownloadHandle downloadHandle = new();
+            DownloadHandler downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
             {
                 if (args.Success)
                 {
                     _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                    _updateFunc(true, Utils.UrlEncode(fileName));
+                }
+                else
+                {
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            downloadHandle.Error += (sender2, args) =>
+            {
+                _updateFunc(false, args.GetException().Message);
+            };
+
+            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
+            var args = await CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease);
+            if (args.Success)
+            {
+                _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
+                _updateFunc(false, args.Msg);
+
+                url = args.Url;
+                fileName = Utils.GetTempPath(Utils.GetGUID());
+                await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
+            }
+            else
+            {
+                _updateFunc(false, args.Msg);
+            }
+        }
+
+        public async Task CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update, bool preRelease)
+        {
+            _config = config;
+            _updateFunc = update;
+            var url = string.Empty;
+            var fileName = string.Empty;
+
+            DownloadHandler downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
+            {
+                if (args.Success)
+                {
+                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                    _updateFunc(false, ResUI.MsgUnpacking);
 
                     try
                     {
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        fileName = Utils.UrlEncode(fileName);
-                        Process process = new()
-                        {
-                            StartInfo = new ProcessStartInfo
-                            {
-                                FileName = "v2rayUpgrade.exe",
-                                Arguments = $"\"{fileName}\"",
-                                WorkingDirectory = Utils.StartupPath()
-                            }
-                        };
-                        process.Start();
-                        if (process.Id > 0)
-                        {
-                            _updateFunc(true, "");
-                        }
+                        _updateFunc(true, fileName);
                     }
                     catch (Exception ex)
                     {
@@ -80,77 +100,25 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            AbsoluteCompleted += (sender2, args) =>
+
+            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, type));
+            var args = await CheckUpdateAsync(downloadHandle, type, preRelease);
+            if (args.Success)
             {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
-                    _updateFunc(false, args.Msg);
+                _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, type));
+                _updateFunc(false, args.Msg);
 
-                    url = args.Url;
-                    _ = askToDownload(downloadHandle, url, true);
-                }
-                else
-                {
-                    Locator.Current.GetService<NoticeHandler>()?.Enqueue(args.Msg);
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "v2rayN"));
-            CheckUpdateAsync(ECoreType.v2rayN, preRelease);
-        }
-
-        public void CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update, bool preRelease)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Empty;
-
-            DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
+                url = args.Url;
+                fileName = Utils.GetTempPath(Utils.GetGUID());
+                await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
+            }
+            else
             {
-                if (args.Success)
-                {
-                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                    _updateFunc(false, ResUI.MsgUnpacking);
-
-                    try
-                    {
-                        _updateFunc(true, url);
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
+                if (!args.Msg.IsNullOrEmpty())
                 {
                     _updateFunc(false, args.Msg);
                 }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(true, args.GetException().Message);
-            };
-
-            AbsoluteCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
-                    _updateFunc(false, args.Msg);
-
-                    url = args.Url;
-                    _ = askToDownload(downloadHandle, url, true);
-                }
-                else
-                {
-                    Locator.Current.GetService<NoticeHandler>()?.Enqueue(args.Msg);
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "Core"));
-            CheckUpdateAsync(type, preRelease);
+            }
         }
 
         public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> update)
@@ -190,7 +158,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var downloadHandle = new DownloadHandle();
+                    var downloadHandle = new DownloadHandler();
                     downloadHandle.Error += (sender2, args) =>
                     {
                         _updateFunc(false, $"{hashCode}{args.GetException().Message}");
@@ -203,7 +171,7 @@ namespace v2rayN.Handler
                     //convert
                     if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
                         url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
@@ -223,15 +191,12 @@ namespace v2rayN.Handler
                     //more url
                     if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
                             result = Utils.Base64Decode(result);
                         }
 
-                        var lstUrl = new List<string>
-                        {
-                            item.moreUrl.TrimEx().Split(",")
-                        };
+                        var lstUrl = item.moreUrl.TrimEx().Split(",") ?? [];
                         foreach (var it in lstUrl)
                         {
                             var url2 = Utils.GetPunycode(it);
@@ -247,7 +212,7 @@ namespace v2rayN.Handler
                             }
                             if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utils.IsBase64String(result2))
+                                if (Utils.IsBase64String(result2!))
                                 {
                                     result += Utils.Base64Decode(result2);
                                 }
@@ -266,7 +231,7 @@ namespace v2rayN.Handler
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result!.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -274,8 +239,8 @@ namespace v2rayN.Handler
                         int ret = ConfigHandler.AddBatchServers(config, result, id, true);
                         if (ret <= 0)
                         {
-                            Utils.SaveLog("FailedImportSubscription");
-                            Utils.SaveLog(result);
+                            Logging.SaveLog("FailedImportSubscription");
+                            Logging.SaveLog(result);
                         }
                         _updateFunc(false,
                             ret > 0
@@ -289,23 +254,18 @@ namespace v2rayN.Handler
             });
         }
 
-        public void UpdateGeoFileAll(Config config, Action<bool, string> update)
+        public async Task UpdateGeoFileAll(Config config, Action<bool, string> update)
         {
-            Task.Run(async () =>
-            {
-                await UpdateGeoFile("geosite", _config, update);
-                await UpdateGeoFile("geoip", _config, update);
-
-                //await UpdateGeoFile4Singbox("geosite", _config, false, update);
-                //await UpdateGeoFile4Singbox("geoip", _config, true, update);
-            });
+            await UpdateGeoFile("geosite", _config, update);
+            await UpdateGeoFile("geoip", _config, update);
+            _updateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
         }
 
         public void RunAvailabilityCheck(Action<bool, string> update)
         {
             Task.Run(async () =>
             {
-                var time = await (new DownloadHandle()).RunAvailabilityCheck(null);
+                var time = await (new DownloadHandler()).RunAvailabilityCheck(null);
 
                 update(false, string.Format(ResUI.TestMeOutput, time));
             });
@@ -313,44 +273,44 @@ namespace v2rayN.Handler
 
         #region private
 
-        private async void CheckUpdateAsync(ECoreType type, bool preRelease)
+        private async Task<ResultEventArgs> CheckUpdateAsync(DownloadHandler downloadHandle, ECoreType type, bool preRelease)
         {
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
-                string url = coreInfo.coreReleaseApiUrl;
+                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
+                var url = coreInfo?.coreReleaseApiUrl;
 
-                var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
+                var result = await downloadHandle.DownloadStringAsync(url, true, Global.AppName);
                 if (!Utils.IsNullOrEmpty(result))
                 {
-                    responseHandler(type, result, preRelease);
+                    return await ParseDownloadUrl(type, result, preRelease);
                 }
                 else
                 {
-                    Utils.SaveLog("StatusCode error: " + url);
-                    return;
+                    return new ResultEventArgs(false, "");
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
+                return new ResultEventArgs(false, ex.Message);
             }
         }
 
         /// <summary>
-        /// 获取V2RayCore版本
+        /// 获取Core版本
         /// </summary>
-        private SemanticVersion getCoreVersion(ECoreType type)
+        private SemanticVersion GetCoreVersion(ECoreType type)
         {
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
                 string filePath = string.Empty;
                 foreach (string name in coreInfo.coreExes)
                 {
-                    string vName = $"{name}.exe";
-                    vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                    string vName = Utils.GetExeName(name);
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;
@@ -366,7 +326,7 @@ namespace v2rayN.Handler
                 }
 
                 using Process p = new();
-                p.StartInfo.FileName = filePath;
+                p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
                 p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
@@ -388,6 +348,7 @@ namespace v2rayN.Handler
 
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
                         break;
 
@@ -399,26 +360,25 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
                 return new SemanticVersion("");
             }
         }
 
-        private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
+        private async Task<ResultEventArgs> ParseDownloadUrl(ECoreType type, string gitHubReleaseApi, bool preRelease)
         {
             try
             {
-                var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
-                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
-                var version = new SemanticVersion(gitHubRelease!.TagName);
-                var body = gitHubRelease!.Body;
-
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease?.TagName!);
+                var body = gitHubRelease?.Body;
 
+                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
                 SemanticVersion curVersion;
                 string message;
-                string url;
+                string? url;
                 switch (type)
                 {
                     case ECoreType.v2fly:
@@ -426,88 +386,32 @@ namespace v2rayN.Handler
                     case ECoreType.Xray:
                     case ECoreType.v2fly_v5:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            string osBit = "64";
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    osBit = "arm64-v8a";
-                                    break;
-
-                                case Architecture.X86:
-                                    osBit = "32";
-                                    break;
-
-                                default:
-                                    osBit = "64";
-                                    break;
-                            }
-
-                            url = string.Format(coreInfo.coreDownloadUrl64, version.ToVersionString("v"), osBit);
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
                             break;
                         }
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = coreInfo.coreDownloadUrlArm64;
-                                    break;
-
-                                case Architecture.X86:
-                                    url = coreInfo.coreDownloadUrl32;
-                                    break;
-
-                                default:
-                                    url = coreInfo.coreDownloadUrl64;
-                                    break;
-                            }
-                            url = string.Format(url, version.ToVersionString("v"));
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
                             break;
                         }
                     case ECoreType.sing_box:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = coreInfo.coreDownloadUrlArm64;
-                                    break;
-
-                                case Architecture.X86:
-                                    url = coreInfo.coreDownloadUrl32;
-                                    break;
-
-                                default:
-                                    url = coreInfo.coreDownloadUrl64;
-                                    break;
-                            }
-                            url = string.Format(url, version.ToVersionString("v"), version);
+                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"), version);
                             break;
                         }
                     case ECoreType.v2rayN:
                         {
-                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
+                            curVersion = new SemanticVersion(Utils.GetVersionInfo());
                             message = string.Format(ResUI.IsLatestN, type, curVersion);
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = string.Format(coreInfo.coreDownloadUrlArm64, version);
-                                    break;
-
-                                case Architecture.X86:
-                                    url = string.Format(coreInfo.coreDownloadUrl32, version);
-                                    break;
-
-                                default:
-                                    url = string.Format(coreInfo.coreDownloadUrl64, version);
-                                    break;
-                            }
+                            url = string.Format(GetUrlFromCore(coreInfo), version);
                             break;
                         }
                     default:
@@ -516,37 +420,51 @@ namespace v2rayN.Handler
 
                 if (curVersion >= version && version != new SemanticVersion(0, 0, 0))
                 {
-                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
-                    return;
+                    return new ResultEventArgs(false, message);
                 }
 
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
+                return new ResultEventArgs(true, body, url);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
+                return new ResultEventArgs(false, ex.Message);
             }
         }
 
-        private async Task askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        private string? GetUrlFromCore(CoreInfo? coreInfo)
         {
-            bool blDownload = false;
-            if (blAsk)
+            if (Utils.IsWindows())
             {
-                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == MessageBoxResult.Yes)
+                //Check for standalone windows .Net version
+                if (coreInfo?.coreType == ECoreType.v2rayN
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "wpfgfx_cor3.dll"))
+                    && File.Exists(Path.Combine(Utils.StartupPath(), "D3DCompiler_47_cor3.dll"))
+                    )
                 {
-                    blDownload = true;
+                    return coreInfo?.coreDownloadUrl64.Replace("v2rayN.zip", "zz_v2rayN-SelfContained.zip");
                 }
+
+                return RuntimeInformation.ProcessArchitecture switch
+                {
+                    Architecture.Arm64 => coreInfo?.coreDownloadUrlArm64,
+                    Architecture.X86 => coreInfo?.coreDownloadUrl32,
+                    Architecture.X64 => coreInfo?.coreDownloadUrl64,
+                    _ => null,
+                };
             }
-            else
+            else if (Utils.IsLinux())
             {
-                blDownload = true;
-            }
-            if (blDownload)
-            {
-                await downloadHandle.DownloadFileAsync(url, true, 600);
+                return RuntimeInformation.ProcessArchitecture switch
+                {
+                    Architecture.Arm64 => coreInfo?.coreDownloadUrlLinuxArm64,
+                    Architecture.X86 => coreInfo?.coreDownloadUrlLinux32,
+                    Architecture.X64 => coreInfo?.coreDownloadUrlLinux64,
+                    _ => null,
+                };
             }
+            return null;
         }
 
         private async Task UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
@@ -554,8 +472,9 @@ namespace v2rayN.Handler
             _config = config;
             _updateFunc = update;
             var url = string.Format(Global.GeoUrl, geoName);
+            var fileName = Utils.GetTempPath(Utils.GetGUID());
 
-            DownloadHandle downloadHandle = new();
+            DownloadHandler downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
             {
                 if (args.Success)
@@ -564,14 +483,8 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
                         if (File.Exists(fileName))
                         {
-                            //Global.coreTypes.ForEach(it =>
-                            //{
-                            //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
-                            //    File.Copy(fileName, targetPath, true);
-                            //});
                             string targetPath = Utils.GetBinPath($"{geoName}.dat");
                             File.Copy(fileName, targetPath, true);
 
@@ -593,55 +506,8 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            await askToDownload(downloadHandle, url, false);
-        }
 
-        private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.SingboxGeoUrl, geoName);
-
-            DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += async (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-                    var coreHandler = Locator.Current.GetService<CoreHandler>();
-
-                    try
-                    {
-                        if (needStop)
-                        {
-                            coreHandler?.CoreStop();
-                            await Task.Delay(3000);
-                        }
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                        }
-                        if (needStop) coreHandler?.LoadCore();
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await askToDownload(downloadHandle, url, false);
+            await downloadHandle.DownloadFileAsync(url, fileName, true, _timeout);
         }
 
         #endregion private

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -0,0 +1,171 @@
+using System.Net;
+using WebDav;
+
+namespace ServiceLib.Handler
+{
+    public sealed class WebDavHandler
+    {
+        private static readonly Lazy<WebDavHandler> _instance = new(() => new());
+        public static WebDavHandler Instance => _instance.Value;
+
+        private Config? _config;
+        private WebDavClient? _client;
+        private string? _lastDescription;
+        private string _webDir = Global.AppName + "_backup";
+        private string _webFileName = "backup.zip";
+        private string _logTitle = "WebDav--";
+
+        public WebDavHandler()
+        {
+            _config = LazyConfig.Instance.Config;
+        }
+
+        private async Task<bool> GetClient()
+        {
+            try
+            {
+                if (_config.webDavItem.url.IsNullOrEmpty()
+                || _config.webDavItem.userName.IsNullOrEmpty()
+                || _config.webDavItem.password.IsNullOrEmpty())
+                {
+                    throw new ArgumentException("webdav parameter error or null");
+                }
+                if (_client != null)
+                {
+                    _client?.Dispose();
+                    _client = null;
+                }
+                if (_config.webDavItem.dirName.IsNullOrEmpty())
+                {
+                    _webDir = Global.AppName + "_backup";
+                }
+                else
+                {
+                    _webDir = _config.webDavItem.dirName.TrimEx();
+                }
+
+                var clientParams = new WebDavClientParams
+                {
+                    BaseAddress = new Uri(_config.webDavItem.url),
+                    Credentials = new NetworkCredential(_config.webDavItem.userName, _config.webDavItem.password)
+                };
+                _client = new WebDavClient(clientParams);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+                return false;
+            }
+            return await Task.FromResult(true);
+        }
+
+        private async Task<bool> TryCreateDir()
+        {
+            if (_client is null) return false;
+            try
+            {
+                var result2 = await _client.Mkcol(_webDir);
+                if (result2.IsSuccessful)
+                {
+                    return true;
+                }
+                SaveLog(result2.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        private void SaveLog(string desc)
+        {
+            _lastDescription = desc;
+            Logging.SaveLog(_logTitle + desc);
+        }
+
+        private void SaveLog(Exception ex)
+        {
+            _lastDescription = ex.Message;
+            Logging.SaveLog(_logTitle, ex);
+        }
+
+        public async Task<bool> CheckConnection()
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            var testName = "readme_test";
+            var myContent = new StringContent(testName);
+            var result = await _client.PutFile($"{_webDir}/{testName}", myContent);
+            if (result.IsSuccessful)
+            {
+                await _client.Delete($"{_webDir}/{testName}");
+                return true;
+            }
+            else
+            {
+                SaveLog(result.Description);
+                return false;
+            }
+        }
+
+        public async Task<bool> PutFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                using var fs = File.OpenRead(fileName);
+                var result = await _client.PutFile($"{_webDir}/{_webFileName}", fs); // upload a resource
+                if (result.IsSuccessful)
+                {
+                    return true;
+                }
+
+                SaveLog(result.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public async Task<bool> GetRawFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                var response = await _client.GetRawFile($"{_webDir}/{_webFileName}");
+                if (!response.IsSuccessful)
+                {
+                    SaveLog(response.Description);
+                    return false;
+                }
+                using var outputFileStream = new FileStream(fileName, FileMode.Create);
+                response.Stream.CopyTo(outputFileStream);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public string GetLastError() => _lastDescription ?? string.Empty;
+    }
+}

v2rayN/ServiceLib/Models/CheckUpdateItem.cs

@@ -0,0 +1,11 @@
+namespace ServiceLib.Models
+{
+    public class CheckUpdateItem
+    {
+        public bool? isSelected { get; set; }
+        public string coreType { get; set; }
+        public string? remarks { get; set; }
+        public string? fileName { get; set; }
+        public bool? isFinished { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ClashConnectionModel.cs

@@ -0,0 +1,17 @@
+namespace ServiceLib.Models
+{
+    public class ClashConnectionModel
+    {
+        public string id { get; set; }
+        public string network { get; set; }
+        public string type { get; set; }
+        public string host { get; set; }
+        public ulong upload { get; set; }
+        public ulong download { get; set; }
+        public string uploadTraffic { get; set; }
+        public string downloadTraffic { get; set; }
+        public double time { get; set; }
+        public string elapsed { get; set; }
+        public string chain { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ClashConnections.cs

@@ -0,0 +1,37 @@
+namespace ServiceLib.Models
+{
+    public class ClashConnections
+    {
+        public ulong downloadTotal { get; set; }
+        public ulong uploadTotal { get; set; }
+        public List<ConnectionItem>? connections { get; set; }
+    }
+
+    public class ConnectionItem
+    {
+        public string id { get; set; } = string.Empty;
+        public MetadataItem metadata { get; set; }
+        public ulong upload { get; set; }
+        public ulong download { get; set; }
+        public DateTime start { get; set; }
+        public List<string>? chains { get; set; }
+        public string rule { get; set; }
+        public string rulePayload { get; set; }
+    }
+
+    public class MetadataItem
+    {
+        public string network { get; set; }
+        public string type { get; set; }
+        public string sourceIP { get; set; }
+        public string destinationIP { get; set; }
+        public string sourcePort { get; set; }
+        public string destinationPort { get; set; }
+        public string host { get; set; }
+        public string nsMode { get; set; }
+        public object uid { get; set; }
+        public string process { get; set; }
+        public string processPath { get; set; }
+        public string remoteDestination { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ClashProviders.cs

@@ -0,0 +1,17 @@
+using static ServiceLib.Models.ClashProxies;
+
+namespace ServiceLib.Models
+{
+    public class ClashProviders
+    {
+        public Dictionary<String, ProvidersItem> providers { get; set; }
+
+        public class ProvidersItem
+        {
+            public string name { get; set; }
+            public ProxiesItem[] proxies { get; set; }
+            public string type { get; set; }
+            public string vehicleType { get; set; }
+        }
+    }
+}

v2rayN/ServiceLib/Models/ClashProxies.cs

@@ -0,0 +1,24 @@
+namespace ServiceLib.Models
+{
+    public class ClashProxies
+    {
+        public Dictionary<String, ProxiesItem> proxies { get; set; }
+
+        public class ProxiesItem
+        {
+            public string[] all { get; set; }
+            public List<HistoryItem> history { get; set; }
+            public string name { get; set; }
+            public string type { get; set; }
+            public bool udp { get; set; }
+            public string now { get; set; }
+            public int delay { get; set; }
+        }
+
+        public class HistoryItem
+        {
+            public string time { get; set; }
+            public int delay { get; set; }
+        }
+    }
+}

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -0,0 +1,18 @@
+namespace ServiceLib.Models
+{
+    [Serializable]
+    public class ClashProxyModel
+    {
+        public string name { get; set; }
+
+        public string type { get; set; }
+
+        public string now { get; set; }
+
+        public int delay { get; set; }
+
+        public string delayName { get; set; }
+
+        public bool isActive { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ComboItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     public class ComboItem
     {

v2rayN/ServiceLib/Models/Config.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     /// <summary>
     /// 本软件配置文件实体类
@@ -10,10 +10,24 @@
 
         public string indexId { get; set; }
         public string subIndexId { get; set; }
-        public ESysProxyType sysProxyType { get; set; }
         public string systemProxyExceptions { get; set; }
         public string systemProxyAdvancedProtocol { get; set; }
 
+        public ECoreType runningCoreType { get; set; }
+
+        public bool IsRunningCore(ECoreType type)
+        {
+            if (type == ECoreType.Xray && runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet)
+            {
+                return true;
+            }
+            if (type == ECoreType.clash && runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
+            {
+                return true;
+            }
+            return false;
+        }
+
         #endregion property
 
         #region other entities
@@ -24,11 +38,16 @@
         public GrpcItem grpcItem { get; set; }
         public RoutingBasicItem routingBasicItem { get; set; }
         public GUIItem guiItem { get; set; }
+        public MsgUIItem msgUIItem { get; set; }
         public UIItem uiItem { get; set; }
         public ConstItem constItem { get; set; }
         public SpeedTestItem speedTestItem { get; set; }
+        public Mux4RayItem mux4RayItem { get; set; }
         public Mux4SboxItem mux4SboxItem { get; set; }
         public HysteriaItem hysteriaItem { get; set; }
+        public ClashUIItem clashUIItem { get; set; }
+        public SystemProxyItem systemProxyItem { get; set; }
+        public WebDavItem webDavItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -1,6 +1,4 @@
-using System.Windows.Input;
-
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -31,6 +29,10 @@ namespace v2rayN.Mode
         /// 默认用户代理
         /// </summary>
         public string defUserAgent { get; set; }
+
+        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
     }
 
     [Serializable]
@@ -43,8 +45,8 @@ namespace v2rayN.Mode
         public bool udpEnabled { get; set; }
 
         public bool sniffingEnabled { get; set; } = true;
+        public List<string>? destOverride { get; set; } = ["http", "tls"];
         public bool routeOnly { get; set; }
-
         public bool allowLANConn { get; set; }
 
         public bool newPort4LAN { get; set; }
@@ -105,14 +107,23 @@ namespace v2rayN.Mode
         public bool enableLog { get; set; } = true;
     }
 
+    [Serializable]
+    public class MsgUIItem
+    {
+        public string? mainMsgFilter { get; set; }
+        public bool? autoRefresh { get; set; }
+    }
+
     [Serializable]
     public class UIItem
     {
         public bool enableAutoAdjustMainLvColWidth { get; set; }
+        public bool enableUpdateSubOnlyRemarksExist { get; set; }
         public double mainWidth { get; set; }
         public double mainHeight { get; set; }
         public double mainGirdHeight1 { get; set; }
         public double mainGirdHeight2 { get; set; }
+        public EGirdOrientation mainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
         public bool colorModeDark { get; set; }
         public bool followSystemTheme { get; set; }
         public string? colorPrimaryName { get; set; }
@@ -121,10 +132,9 @@ namespace v2rayN.Mode
         public int currentFontSize { get; set; }
         public bool enableDragDropSort { get; set; }
         public bool doubleClick2Activate { get; set; }
-        public bool autoHideStartup { get; set; } = true;
-        public string mainMsgFilter { get; set; }
-        public bool showTrayTip { get; set; }
+        public bool autoHideStartup { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
+        public bool showInTaskbar { get; set; }
     }
 
     [Serializable]
@@ -145,7 +155,7 @@ namespace v2rayN.Mode
 
         public bool Shift { get; set; }
 
-        public Key? KeyCode { get; set; }
+        public int? KeyCode { get; set; }
     }
 
     [Serializable]
@@ -164,7 +174,7 @@ namespace v2rayN.Mode
         public string stack { get; set; }
         public int mtu { get; set; }
         public bool enableExInbound { get; set; }
-        public bool enableIPv6Address { get; set; } = true;
+        public bool enableIPv6Address { get; set; }
     }
 
     [Serializable]
@@ -178,13 +188,8 @@ namespace v2rayN.Mode
     [Serializable]
     public class RoutingBasicItem
     {
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
         public string domainStrategy { get; set; }
-
         public string domainStrategy4Singbox { get; set; }
-
         public string domainMatcher { get; set; }
         public string routingIndexId { get; set; }
         public bool enableRoutingAdvanced { get; set; }
@@ -198,14 +203,20 @@ namespace v2rayN.Mode
         public int Index { get; set; }
     }
 
+    [Serializable]
+    public class Mux4RayItem
+    {
+        public int? concurrency { get; set; }
+        public int? xudpConcurrency { get; set; }
+        public string? xudpProxyUDP443 { get; set; }
+    }
+
     [Serializable]
     public class Mux4SboxItem
     {
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
+        public bool? padding { get; set; }
     }
 
     [Serializable]
@@ -214,4 +225,36 @@ namespace v2rayN.Mode
         public int up_mbps { get; set; }
         public int down_mbps { get; set; }
     }
+
+    [Serializable]
+    public class ClashUIItem
+    {
+        public ERuleMode ruleMode { get; set; }
+        public bool enableIPv6 { get; set; }
+        public bool enableMixinContent { get; set; }
+        public int proxiesSorting { get; set; }
+        public bool proxiesAutoRefresh { get; set; }
+        public int proxiesAutoDelayTestInterval { get; set; } = 10;
+        public int connectionsSorting { get; set; }
+        public bool connectionsAutoRefresh { get; set; }
+        public int connectionsRefreshInterval { get; set; } = 2;
+    }
+
+    [Serializable]
+    public class SystemProxyItem
+    {
+        public ESysProxyType sysProxyType { get; set; }
+        public string systemProxyExceptions { get; set; }
+        public bool notProxyLocalAddress { get; set; } = true;
+        public string systemProxyAdvancedProtocol { get; set; }
+    }
+
+    [Serializable]
+    public class WebDavItem
+    {
+        public string? url { get; set; }
+        public string? userName { get; set; }
+        public string? password { get; set; }
+        public string? dirName { get; set; }
+    }
 }

v2rayN/ServiceLib/Models/CoreInfo.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class CoreInfo
@@ -18,6 +18,9 @@
         public string coreDownloadUrl64 { get; set; }
 
         public string coreDownloadUrlArm64 { get; set; }
+        public string? coreDownloadUrlLinux32 { get; set; }
+        public string? coreDownloadUrlLinux64 { get; set; }
+        public string? coreDownloadUrlLinuxArm64 { get; set; }
 
         public string match { get; set; }
         public string versionArg { get; set; }

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class DNSItem
@@ -15,5 +15,6 @@ namespace v2rayN.Mode
         public string? normalDNS { get; set; }
         public string? tunDNS { get; set; }
         public string? domainStrategy4Freedom { get; set; }
+        public string? domainDNSAddress { get; set; }
     }
 }

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -0,0 +1,68 @@
+using System.Text.Json.Serialization;
+
+namespace ServiceLib.Models
+{
+    public class GitHubReleaseAsset
+    {
+        [JsonPropertyName("url")] public string Url { get; set; }
+
+        [JsonPropertyName("id")] public int Id { get; set; }
+
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
+
+        [JsonPropertyName("name")] public string Name { get; set; }
+
+        [JsonPropertyName("label")] public object Label { get; set; }
+
+        [JsonPropertyName("content_type")] public string ContentType { get; set; }
+
+        [JsonPropertyName("state")] public string State { get; set; }
+
+        [JsonPropertyName("size")] public int Size { get; set; }
+
+        [JsonPropertyName("download_count")] public int DownloadCount { get; set; }
+
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
+
+        [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
+
+        [JsonPropertyName("browser_download_url")] public string BrowserDownloadUrl { get; set; }
+    }
+
+    public class GitHubRelease
+    {
+        [JsonPropertyName("url")] public string Url { get; set; }
+
+        [JsonPropertyName("assets_url")] public string AssetsUrl { get; set; }
+
+        [JsonPropertyName("upload_url")] public string UploadUrl { get; set; }
+
+        [JsonPropertyName("html_url")] public string HtmlUrl { get; set; }
+
+        [JsonPropertyName("id")] public int Id { get; set; }
+
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
+
+        [JsonPropertyName("tag_name")] public string TagName { get; set; }
+
+        [JsonPropertyName("target_commitish")] public string TargetCommitish { get; set; }
+
+        [JsonPropertyName("name")] public string Name { get; set; }
+
+        [JsonPropertyName("draft")] public bool Draft { get; set; }
+
+        [JsonPropertyName("prerelease")] public bool Prerelease { get; set; }
+
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
+
+        [JsonPropertyName("published_at")] public DateTime PublishedAt { get; set; }
+
+        [JsonPropertyName("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
+
+        [JsonPropertyName("tarball_url")] public string TarballUrl { get; set; }
+
+        [JsonPropertyName("zipball_url")] public string ZipballUrl { get; set; }
+
+        [JsonPropertyName("body")] public string Body { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class ProfileExItem

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,7 +1,6 @@
 using SQLite;
-using v2rayN.Base;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class ProfileItem
@@ -48,18 +47,12 @@ namespace v2rayN.Mode
             }
             switch (configType)
             {
-                case EConfigType.VMess:
-                case EConfigType.Shadowsocks:
-                case EConfigType.Socks:
-                case EConfigType.VLESS:
-                case EConfigType.Trojan:
-                case EConfigType.Hysteria2:
-                case EConfigType.Tuic:
-                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                case EConfigType.Custom:
+                    summary += string.Format("[{1}]{0}", remarks, coreType.ToString());
                     break;
 
                 default:
-                    summary += string.Format("{0}", remarks);
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
                     break;
             }
             return summary;
@@ -185,7 +178,7 @@ namespace v2rayN.Mode
 
         public ECoreType? coreType { get; set; }
 
-        public int preSocksPort { get; set; }
+        public int? preSocksPort { get; set; }
 
         public string fingerprint { get; set; }
 

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class ProfileItemModel : ProfileItem

v2rayN/ServiceLib/Models/RoutingItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class RoutingItem
@@ -15,6 +15,7 @@ namespace v2rayN.Mode
         public bool enabled { get; set; } = true;
         public bool locked { get; set; }
         public string customIcon { get; set; }
+        public string customRulesetPath4Singbox { get; set; }
         public string domainStrategy { get; set; }
         public string domainStrategy4Singbox { get; set; }
         public int sort { get; set; }

v2rayN/ServiceLib/Models/RoutingItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class RoutingItemModel : RoutingItem

v2rayN/ServiceLib/Models/RulesItem.cs

@@ -0,0 +1,26 @@
+namespace ServiceLib.Models
+{
+    [Serializable]
+    public class RulesItem
+    {
+        public string id { get; set; }
+        public string? type { get; set; }
+
+        public string? port { get; set; }
+        public string? network { get; set; }
+
+        public List<string>? inboundTag { get; set; }
+
+        public string? outboundTag { get; set; }
+
+        public List<string>? ip { get; set; }
+
+        public List<string>? domain { get; set; }
+
+        public List<string>? protocol { get; set; }
+
+        public List<string>? process { get; set; }
+
+        public bool enabled { get; set; } = true;
+    }
+}

v2rayN/ServiceLib/Models/RulesItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class RulesItemModel : RulesItem

v2rayN/ServiceLib/Models/ServerSpeedItem.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
-    internal class ServerSpeedItem : ServerStatItem
+    public class ServerSpeedItem : ServerStatItem
     {
         public long proxyUp
         {

v2rayN/ServiceLib/Models/ServerStatItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class ServerStatItem

v2rayN/ServiceLib/Models/ServerTestItem.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
-    internal class ServerTestItem
+    public class ServerTestItem
     {
         public string indexId { get; set; }
         public string address { get; set; }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,13 +1,13 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     public class SingboxConfig
     {
         public Log4Sbox log { get; set; }
-        public object dns { get; set; }
+        public Dns4Sbox? dns { get; set; }
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
-        public Experimental4Sbox experimental { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
     }
 
     public class Log4Sbox
@@ -15,7 +15,7 @@
         public bool? disabled { get; set; }
         public string level { get; set; }
         public string output { get; set; }
-        public bool timestamp { get; set; }
+        public bool? timestamp { get; set; }
     }
 
     public class Dns4Sbox
@@ -28,6 +28,7 @@
         public bool? disable_expire { get; set; }
         public bool? independent_cache { get; set; }
         public bool? reverse_mapping { get; set; }
+        public string? client_subnet { get; set; }
         public Fakeip4Sbox? fakeip { get; set; }
     }
 
@@ -35,19 +36,24 @@
     {
         public bool? auto_detect_interface { get; set; }
         public List<Rule4Sbox> rules { get; set; }
+        public List<Ruleset4Sbox>? rule_set { get; set; }
     }
 
     [Serializable]
     public class Rule4Sbox
     {
-        public string outbound { get; set; }
-        public string server { get; set; }
+        public string? outbound { get; set; }
+        public string? server { get; set; }
         public bool? disable_cache { get; set; }
+        public string? type { get; set; }
+        public string? mode { get; set; }
+        public bool? ip_is_private { get; set; }
+        public string? client_subnet { get; set; }
+        public bool? invert { get; set; }
+        public string? clash_mode { get; set; }
         public List<string>? inbound { get; set; }
         public List<string>? protocol { get; set; }
-        public string type { get; set; }
-        public string mode { get; set; }
-        public string network { get; set; }
+        public List<string>? network { get; set; }
         public List<int>? port { get; set; }
         public List<string>? port_range { get; set; }
         public List<string>? geosite { get; set; }
@@ -58,8 +64,9 @@
         public List<string>? geoip { get; set; }
         public List<string>? ip_cidr { get; set; }
         public List<string>? source_ip_cidr { get; set; }
-
         public List<string>? process_name { get; set; }
+        public List<string>? rule_set { get; set; }
+        public List<Rule4Sbox>? rules { get; set; }
     }
 
     [Serializable]
@@ -93,7 +100,7 @@
     {
         public string type { get; set; }
         public string tag { get; set; }
-        public string server { get; set; }
+        public string? server { get; set; }
         public int? server_port { get; set; }
         public string uuid { get; set; }
         public string security { get; set; }
@@ -112,10 +119,20 @@
         public string congestion_control { get; set; }
         public string? version { get; set; }
         public string? network { get; set; }
-        public string packet_encoding { get; set; }
-        public Tls4Sbox tls { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
-        public Transport4Sbox transport { get; set; }
+        public string? packet_encoding { get; set; }
+        public string[]? local_address { get; set; }
+        public string? private_key { get; set; }
+        public string? peer_public_key { get; set; }
+        public int[]? reserved { get; set; }
+        public int? mtu { get; set; }
+        public string? plugin { get; set; }
+        public string? plugin_opts { get; set; }
+        public Tls4Sbox? tls { get; set; }
+        public Multiplex4Sbox? multiplex { get; set; }
+        public Transport4Sbox? transport { get; set; }
+        public HyObfs4Sbox? obfs { get; set; }
+        public List<string>? outbounds { get; set; }
+        public bool? interrupt_exist_connections { get; set; }
     }
 
     public class Tls4Sbox
@@ -133,9 +150,7 @@
         public bool enabled { get; set; }
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
+        public bool? padding { get; set; }
     }
 
     public class Utls4Sbox
@@ -153,14 +168,14 @@
 
     public class Transport4Sbox
     {
-        public string type { get; set; }
-        public List<string>? host { get; set; }
+        public string? type { get; set; }
+        public object? host { get; set; }
         public string? path { get; set; }
         public Headers4Sbox? headers { get; set; }
 
-        public string service_name { get; set; }
-        public string idle_timeout { get; set; }
-        public string ping_timeout { get; set; }
+        public string? service_name { get; set; }
+        public string? idle_timeout { get; set; }
+        public string? ping_timeout { get; set; }
         public bool? permit_without_stream { get; set; }
     }
 
@@ -169,13 +184,21 @@
         public string? Host { get; set; }
     }
 
+    public class HyObfs4Sbox
+    {
+        public string? type { get; set; }
+        public string? password { get; set; }
+    }
+
     public class Server4Sbox
     {
-        public string tag { get; set; }
-        public string address { get; set; }
-        public string address_resolver { get; set; }
-        public string strategy { get; set; }
-        public string detour { get; set; }
+        public string? tag { get; set; }
+        public string? address { get; set; }
+        public string? address_resolver { get; set; }
+        public string? address_strategy { get; set; }
+        public string? strategy { get; set; }
+        public string? detour { get; set; }
+        public string? client_subnet { get; set; }
     }
 
     public class Experimental4Sbox
@@ -219,4 +242,15 @@
         public string? cache_id { get; set; }
         public bool? store_fakeip { get; set; }
     }
+
+    public class Ruleset4Sbox
+    {
+        public string? tag { get; set; }
+        public string? type { get; set; }
+        public string? format { get; set; }
+        public string? path { get; set; }
+        public string? url { get; set; }
+        public string? download_detour { get; set; }
+        public string? update_interval { get; set; }
+    }
 }

v2rayN/ServiceLib/Models/SpeedTestResult.cs

@@ -0,0 +1,12 @@
+namespace ServiceLib.Models
+{
+    [Serializable]
+    public class SpeedTestResult
+    {
+        public string? IndexId { get; set; }
+
+        public string? Delay { get; set; }
+
+        public string? Speed { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/SsSIP008.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     public class SsSIP008
     {

v2rayN/ServiceLib/Models/SubItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     [Serializable]
     public class SubItem
@@ -31,5 +31,7 @@ namespace v2rayN.Mode
         public string? prevProfile { get; set; }
 
         public string? nextProfile { get; set; }
+
+        public int? preSocksPort { get; set; }
     }
 }

v2rayN/ServiceLib/Models/SysProxyConfig.cs

@@ -1,6 +1,6 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
-    internal class SysproxyConfig
+    public class SysProxyConfig
     {
         public bool UserSettingsRecorded;
         public string Flags;
@@ -8,7 +8,7 @@
         public string BypassList;
         public string PacUrl;
 
-        public SysproxyConfig()
+        public SysProxyConfig()
         {
             UserSettingsRecorded = false;
             Flags = "1";

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -1,13 +1,17 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     /// <summary>
-    /// v2ray配置文件实体类
-    /// 例子SampleConfig.txt
+    /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
+        /// <summary>
+        /// Properties that do not belong to Ray
+        /// </summary>
+        public string? remarks { get; set; }
+
         /// <summary>
         /// 日志配置
         /// </summary>
@@ -32,7 +36,7 @@ namespace v2rayN.Mode
         public API4Ray api { get; set; }
 
         /// </summary>
-        public Policy4Ray policy;
+        public Policy4Ray policy { get; set; }
 
         /// <summary>
         /// DNS 配置
@@ -56,13 +60,13 @@ namespace v2rayN.Mode
 
     public class Policy4Ray
     {
-        public SystemPolicy4Ray system;
+        public SystemPolicy4Ray system { get; set; }
     }
 
     public class SystemPolicy4Ray
     {
-        public bool statsOutboundUplink;
-        public bool statsOutboundDownlink;
+        public bool statsOutboundUplink { get; set; }
+        public bool statsOutboundDownlink { get; set; }
     }
 
     public class Log4Ray
@@ -191,7 +195,7 @@ namespace v2rayN.Mode
     public class Sniffing4Ray
     {
         public bool enabled { get; set; }
-        public List<string> destOverride { get; set; }
+        public List<string>? destOverride { get; set; }
         public bool routeOnly { get; set; }
     }
 
@@ -228,7 +232,7 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public List<VnextItem4Ray> vnext { get; set; }
+        public List<VnextItem4Ray>? vnext { get; set; }
 
         /// <summary>
         ///
@@ -249,6 +253,8 @@ namespace v2rayN.Mode
         ///
         /// </summary>
         public int? userLevel { get; set; }
+
+        public FragmentItem4Ray? fragment { get; set; }
     }
 
     public class VnextItem4Ray
@@ -284,17 +290,17 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public string method { get; set; }
+        public string? method { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public bool ota { get; set; }
+        public bool? ota { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public string password { get; set; }
+        public string? password { get; set; }
 
         /// <summary>
         ///
@@ -304,7 +310,7 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// trojan
@@ -332,20 +338,15 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
     }
 
     public class Mux4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public bool enabled { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public int concurrency { get; set; }
+        public int? concurrency { get; set; }
+        public int? xudpConcurrency { get; set; }
+        public string? xudpProxyUDP443 { get; set; }
     }
 
     public class Response4Ray
@@ -364,6 +365,12 @@ namespace v2rayN.Mode
         public List<string> servers { get; set; }
     }
 
+    public class DnsServer4Ray
+    {
+        public string? address { get; set; }
+        public List<string>? domains { get; set; }
+    }
+
     public class Routing4Ray
     {
         /// <summary>
@@ -374,30 +381,47 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public string domainMatcher { get; set; }
+        public string? domainMatcher { get; set; }
 
         /// <summary>
         ///
         /// </summary>
         public List<RulesItem4Ray> rules { get; set; }
+
+        public List<BalancersItem4Ray>? balancers { get; set; }
     }
 
     [Serializable]
     public class RulesItem4Ray
     {
-        public string type { get; set; }
+        public string? type { get; set; }
 
-        public string port { get; set; }
+        public string? port { get; set; }
+        public string? network { get; set; }
 
-        public List<string> inboundTag { get; set; }
+        public List<string>? inboundTag { get; set; }
 
-        public string outboundTag { get; set; }
+        public string? outboundTag { get; set; }
 
-        public List<string> ip { get; set; }
+        public string? balancerTag { get; set; }
 
-        public List<string> domain { get; set; }
+        public List<string>? ip { get; set; }
 
-        public List<string> protocol { get; set; }
+        public List<string>? domain { get; set; }
+
+        public List<string>? protocol { get; set; }
+    }
+
+    public class BalancersItem4Ray
+    {
+        public List<string>? selector { get; set; }
+        public BalancersStrategy4Ray? strategy { get; set; }
+        public string? tag { get; set; }
+    }
+
+    public class BalancersStrategy4Ray
+    {
+        public string? type { get; set; }
     }
 
     public class StreamSettings4Ray
@@ -415,42 +439,52 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public TlsSettings4Ray tlsSettings { get; set; }
+        public TlsSettings4Ray? tlsSettings { get; set; }
 
         /// <summary>
         /// Tcp传输额外设置
         /// </summary>
-        public TcpSettings4Ray tcpSettings { get; set; }
+        public TcpSettings4Ray? tcpSettings { get; set; }
 
         /// <summary>
         /// Kcp传输额外设置
         /// </summary>
-        public KcpSettings4Ray kcpSettings { get; set; }
+        public KcpSettings4Ray? kcpSettings { get; set; }
 
         /// <summary>
         /// ws传输额外设置
         /// </summary>
-        public WsSettings4Ray wsSettings { get; set; }
+        public WsSettings4Ray? wsSettings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public SplithttpSettings4Ray? splithttpSettings { get; set; }
 
         /// <summary>
         /// h2传输额外设置
         /// </summary>
-        public HttpSettings4Ray httpSettings { get; set; }
+        public HttpSettings4Ray? httpSettings { get; set; }
 
         /// <summary>
         /// QUIC
         /// </summary>
-        public QuicSettings4Ray quicSettings { get; set; }
+        public QuicSettings4Ray? quicSettings { get; set; }
 
         /// <summary>
         /// VLESS only
         /// </summary>
-        public TlsSettings4Ray realitySettings { get; set; }
+        public TlsSettings4Ray? realitySettings { get; set; }
 
         /// <summary>
         /// grpc
         /// </summary>
-        public GrpcSettings4Ray grpcSettings { get; set; }
+        public GrpcSettings4Ray? grpcSettings { get; set; }
 
         /// <summary>
         /// sockopt
@@ -477,7 +511,7 @@ namespace v2rayN.Mode
 
         public string? fingerprint { get; set; }
 
-        public bool? show { get; set; } = false;
+        public bool? show { get; set; }
         public string? publicKey { get; set; }
         public string? shortId { get; set; }
         public string? spiderX { get; set; }
@@ -580,10 +614,34 @@ namespace v2rayN.Mode
         /// <summary>
         /// 用户代理
         /// </summary>
-        [JsonProperty("User-Agent")]
+        [JsonPropertyName("User-Agent")]
         public string UserAgent { get; set; }
     }
 
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
+    public class SplithttpSettings4Ray
+    {
+        public string? path { get; set; }
+
+        public string? host { get; set; }
+
+        public int? maxUploadSize { get; set; }
+
+        public int? maxConcurrentUploads { get; set; }
+    }
+
     public class HttpSettings4Ray
     {
         /// <summary>
@@ -617,7 +675,8 @@ namespace v2rayN.Mode
 
     public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }
@@ -642,4 +701,11 @@ namespace v2rayN.Mode
     {
         public string? dialerProxy { get; set; }
     }
+
+    public class FragmentItem4Ray
+    {
+        public string? packets { get; set; }
+        public string? length { get; set; }
+        public string? interval { get; set; }
+    }
 }

v2rayN/ServiceLib/Models/V2rayTcpRequest.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace ServiceLib.Models
 {
     /// <summary>
     /// Tcp伪装http的Request，只要Host

v2rayN/ServiceLib/Models/VmessQRCode.cs

@@ -0,0 +1,44 @@
+using System.Text.Json.Serialization;
+
+namespace ServiceLib.Models
+{
+    /// <summary>
+    /// https://github.com/2dust/v2rayN/wiki/
+    /// </summary>
+    [Serializable]
+    public class VmessQRCode
+    {
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int v { get; set; } = 2;
+
+        public string ps { get; set; } = string.Empty;
+
+        public string add { get; set; } = string.Empty;
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int port { get; set; } = 0;
+
+        public string id { get; set; } = string.Empty;
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int aid { get; set; } = 0;
+
+        public string scy { get; set; } = string.Empty;
+
+        public string net { get; set; } = string.Empty;
+
+        public string type { get; set; } = string.Empty;
+
+        public string host { get; set; } = string.Empty;
+
+        public string path { get; set; } = string.Empty;
+
+        public string tls { get; set; } = string.Empty;
+
+        public string sni { get; set; } = string.Empty;
+
+        public string alpn { get; set; } = string.Empty;
+
+        public string fp { get; set; } = string.Empty;
+    }
+}

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>صادرات دسته ای محتوای اشتراک به کلیپ بورد با موفقیت انجام شد</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>Batch export share URL to clipboard successfully</value>
   </data>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>لطفا فرمت صحیح پورت سرور را پر کنید</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>لطفاً پارامترهای KCP را به درستی پر کنید</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>لطفاً پورت گوش دادن محلی را پر کنید</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>لطفا شناسه کاربری را وارد کنید</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>فایل پیکربندی مشتری صحیح نیست، لطفا بررسی کنید</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>پیکربندی درستی نیست، لطفا بررسی کنید</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>فایل پیکربندی سرور صحیح نیست، لطفا بررسی کنید</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>پیکربندی اولیه</value>
   </data>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value> non-standard service, this feature is invalid</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
   </data>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>پروکسی سیستم</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>درحال تست کردن...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>تعداد سرورها خیلی زیاد است، لطفا رابط اصلی را باز کنید</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
@@ -529,9 +508,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>تمام آمار خدمات را پاک کنید</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>تست پینگ سرورها (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>آزمایش سرورها با تاخیر واقعی (Ctrl+R)</value>
   </data>
@@ -544,18 +520,12 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>تست سرورها با tcping (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>وضعیت سرویس فعلی را تست کنید</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>سرور انتخابی را برای پیکربندی کلاینت صادر کنید</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>URL های اشتراک گذاری را به کلیپ بورد صادر کنید (Ctrl+C)</value>
   </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>اشتراک (base64) را به کلیپ بورد صادر کنید</value>
-  </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>یک سرور پیکربندی سفارشی اضافه شود</value>
   </data>
@@ -586,9 +556,6 @@
   <data name="menuMsgViewCopyAll" xml:space="preserve">
     <value>کپی همه</value>
   </data>
-  <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>فیلترهای پیام را تنظیم کنید</value>
-  </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
     <value>انتخاب همه (Ctrl+A)</value>
   </data>
@@ -701,7 +668,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -958,6 +925,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>فقط مسیر</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>يەرلىك (Intranet) ئادرېسلارغا ۋاكالەتچى مۇلازىمېتىر ئىشلەتمەڭ</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>One-click test Latency and speed (Ctrl+E)</value>
   </data>
@@ -988,15 +958,6 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>تنظیمات TunMode</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>Direct IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>Direct Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>نمایش کنسول</value>
-  </data>
   <data name="TbSettingsDefUserAgent" xml:space="preserve">
     <value>User-Agent</value>
   </data>
@@ -1006,4 +967,70 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
   </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>فعال کردن کش فایل مجموعه قوانین برای sing-box</value>
+  </data>
+  <data name="TbSorting" xml:space="preserve">
+    <value>مرتب سازی</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>تاخیر</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>سرعت دانلود</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>ترافیک دانلود</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>نام</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>زمان</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>سرعت اپلود</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>ترافیک آپلود</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>اتصالات</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>بستن اتصال</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>تمام اتصالات را ببندید</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>پروکسی</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>نوع قانون</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>Direct</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>Global</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>تغییر نده</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>قانون</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>Latency Test</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>Part Node Latency Test</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>Select active node (Enter)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -117,11 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>Batch export subscription to clipboard successfully</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
-    <value>Batch export share URL to clipboard successfully</value>
+    <value>Export Share Link to Clipboard Successfully</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
     <value>Please check the server settings first</value>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>Please fill in the correct format server port</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>Please fill in the KCP parameters correctly</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>Please fill in the local listening port</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>Please fill in the user ID</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>Is not the correct client configuration file, please check</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>Is not the correct configuration, please check</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>Is not the correct server configuration file, please check</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>Initial Configuration</value>
   </data>
@@ -253,10 +241,10 @@
     <value>Is unpacking......</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
-    <value>Update subscription end</value>
+    <value>Update subscriptions end</value>
   </data>
   <data name="MsgUpdateSubscriptionStart" xml:space="preserve">
-    <value>Update subscription starts</value>
+    <value>Update subscriptions start</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
     <value>Update Core successfully</value>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value>Non-standard service, this feature is invalid</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
   </data>
@@ -314,7 +299,7 @@
     <value>{0} servers have been imported from clipboard</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>Scan import URL successfully</value>
+    <value>Scan import the shared link successfully</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
     <value>The ping of current service: {0} ms</value>
@@ -335,13 +320,13 @@
     <value>Remarks</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Optional)</value>
+    <value>URL(Optional)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the Url</value>
+    <value>Please fill in the URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
@@ -359,13 +344,13 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade/splithttp path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC key/Kcp seed</value>
+    <value>*QUIC key/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
     <value>*grpc serviceName</value>
@@ -374,7 +359,7 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade/splithttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
@@ -398,7 +383,7 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Global hotkey {0} registered failed, reason {1}</value>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>System proxy</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Testing...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>Too many servers, please open the main interface</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
@@ -443,13 +422,13 @@
     <value>Exit</value>
   </data>
   <data name="menuGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkeySetting</value>
+    <value>Global Hotkey Setting</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
     <value>Help</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>OptionSetting</value>
+    <value>Option Setting</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
     <value>Promotion</value>
@@ -458,7 +437,7 @@
     <value>Reload</value>
   </data>
   <data name="menuRoutingSetting" xml:space="preserve">
-    <value>RoutingSetting</value>
+    <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
     <value>Servers</value>
@@ -473,16 +452,16 @@
     <value>Update current subscription with proxy</value>
   </data>
   <data name="menuSubscription" xml:space="preserve">
-    <value>Subscription group</value>
+    <value>Subscription Group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Settings</value>
+    <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
-    <value>Update subscription without proxy</value>
+    <value>Update subscriptions without proxy</value>
   </data>
   <data name="menuSubUpdateViaProxy" xml:space="preserve">
-    <value>Update subscription with proxy</value>
+    <value>Update subscriptions with proxy</value>
   </data>
   <data name="menuSystemproxy" xml:space="preserve">
     <value>System proxy</value>
@@ -494,7 +473,7 @@
     <value>Do not change system proxy</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>Set system proxy</value>
@@ -509,10 +488,10 @@
     <value>Follow System Theme</value>
   </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
-    <value>Language(Restart)</value>
+    <value>Language (Restart)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
-    <value>Import bulk URL from clipboard (Ctrl+V)</value>
+    <value>Importing Share Links from clipboard (Ctrl+V)</value>
   </data>
   <data name="menuAddServerViaScan" xml:space="preserve">
     <value>Scan QR code on the screen (Ctrl+S)</value>
@@ -532,9 +511,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Test servers ping (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Test servers real delay (Ctrl+R)</value>
   </data>
@@ -547,17 +523,11 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>Test servers with tcping (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>Test current service status</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>Export selected server for client configuration</value>
+    <value>Export selected server for complete configuration</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
-    <value>Export share URLs to clipboard (Ctrl+C)</value>
-  </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>Export subscription (base64) share to clipboard</value>
+    <value>Export Share Link to Clipboard (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>Add a custom configuration server</value>
@@ -578,22 +548,19 @@
     <value>Add [VMess] server</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
-    <value>Clear All</value>
+    <value>Clear all</value>
   </data>
   <data name="menuMsgViewCopy" xml:space="preserve">
     <value>Copy (Ctrl+C)</value>
   </data>
   <data name="menuMsgViewCopyAll" xml:space="preserve">
-    <value>Copy All</value>
-  </data>
-  <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>Set message filters</value>
+    <value>Copy all</value>
   </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuSubAdd" xml:space="preserve">
     <value>Add</value>
@@ -608,7 +575,7 @@
     <value>Share</value>
   </data>
   <data name="LvEnabled" xml:space="preserve">
-    <value>Enabled Update</value>
+    <value>Enable update</value>
   </data>
   <data name="LvSort" xml:space="preserve">
     <value>Sort</value>
@@ -632,10 +599,10 @@
     <value>AllowInsecure</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>AlterId</value>
+    <value>AlterID</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -701,10 +668,10 @@
     <value>Encryption</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
-    <value>txtPreSocksPort</value>
+    <value>Socks port</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -755,7 +722,7 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>HTTP Port</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>Ignore Geo files when updating core</value>
@@ -788,7 +755,7 @@
     <value>Turn on Sniffing</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>SOCKS Port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>Start on boot</value>
@@ -797,7 +764,7 @@
     <value>Enable Statistics (Require restart)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>Subscription conversion Url</value>
+    <value>Subscription conversion URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
@@ -821,10 +788,10 @@
     <value>Display GUI</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Settings</value>
+    <value>Global Hotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>Set directly by pressing the keyboard, take effect after restart</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
     <value>Do not change system proxy</value>
@@ -836,7 +803,7 @@
     <value>Set system proxy</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>Share Server (Ctrl+F)</value>
@@ -845,10 +812,10 @@
     <value>Routing</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Not Run As Admin</value>
+    <value>Not run as Admin</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Run As Admin</value>
+    <value>Run as Admin</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
     <value>Move to bottom (B)</value>
@@ -920,13 +887,13 @@
     <value>Import Rules From File</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>Import Rules From Subscription URL</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>Add Rule</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
     <value>Export Selected Rules</value>
@@ -935,7 +902,7 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules (Delete)</value>
+    <value>Remove Rule (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>
@@ -950,7 +917,7 @@
     <value>Support DnsObject, Click to view the document</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
-    <value>Group please leave blank here</value>
+    <value>For group please leave blank here</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
     <value>Routing setting is changed</value>
@@ -961,6 +928,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>RouteOnly</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>Do not use proxy servers for local (intranet) addresses</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>One-click multi test Latency and speed (Ctrl+E)</value>
   </data>
@@ -980,7 +950,7 @@
     <value>Display Log</value>
   </data>
   <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config guiNConfig</value>
+    <value>Import old config (guiNConfig)</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Enable Tun</value>
@@ -991,21 +961,9 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>TunMode settings</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>Direct IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>Direct Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>Show console</value>
-  </data>
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>Move to group</value>
   </data>
-  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
-    <value>Custom Template</value>
-  </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
     <value>Enable Server Drag Drop Sort(Require restart)</value>
   </data>
@@ -1040,31 +998,19 @@
     <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http port=socks port+1</value>
+    <value>http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6;</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Set this with admin privileges, get admin privileges after startup</value>
   </data>
   <data name="TbSettingsFontSize" xml:space="preserve">
-    <value>FontSize</value>
-  </data>
-  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
-    <value>Proxy IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
-    <value>Proxy Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
-    <value>Bypass Mode</value>
+    <value>Font Size</value>
   </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
     <value>SpeedTest Single Timeout Value</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>SpeedTest Url</value>
-  </data>
-  <data name="TbSettingsTunModeDNS" xml:space="preserve">
-    <value>DNS object, e.g. {"servers":[]}</value>
+    <value>SpeedTest URL</value>
   </data>
   <data name="menuMoveTo" xml:space="preserve">
     <value>Move up and down</value>
@@ -1082,7 +1028,7 @@
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Waiting for testing......</value>
+    <value>Waiting for testing (press ESC to terminate)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>Please turn off when there is an abnormal disconnection</value>
@@ -1091,16 +1037,16 @@
     <value>Updates are not enabled, skip this subscription</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
-    <value>Reboot as administrator</value>
+    <value>Restart as Administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>More urls, separated by commas;Subscription conversion will be invalid</value>
+    <value>More URLs, separated by commas; Subscription conversion will be invalid</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
     <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
-    <value>Automatic update interval(minutes)</value>
+    <value>Automatic update interval (minutes)</value>
   </data>
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
     <value>Enable logging to file</value>
@@ -1139,7 +1085,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Add [Trojan] server</value>
+    <value>Add [Hysteria2] server</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria Max bandwidth (Up/Dw)</value>
@@ -1154,7 +1100,7 @@
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remakrs</value>
+    <value>Previous proxy remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
     <value>Next proxy remarks</value>
@@ -1168,4 +1114,205 @@
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Enable IPv6 Address</value>
   </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>Add [Wireguard] server</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>Auto ScrollToEnd</value>
+  </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>Speed Ping Test URL</value>
+  </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determine remarks exists</value>
+  </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>Add [Http] server</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>Enable fragment</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>Enable cache file for sing-box (ruleset files)</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
+  <data name="TbSorting" xml:space="preserve">
+    <value>Sorting</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>Chain</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>Delay</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>Download Speed</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>Download Traffic</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>Upload Speed</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>Upload Traffic</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>Connections</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>Close Connection</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>Close All Connection</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>Proxies</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>Rule mode</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>Direct</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>Global</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>Do not change</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>Rule</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>Latency Test</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>Part Node Latency Test</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>Refresh Proxies</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>Select active node (Enter)</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Default domain strategy for outbound</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>Multi-Server lowest latency</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>Main layout orientation(Require restart)</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>Multi-server load balancing</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound DNS address</value>
+  </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>Auto column width adjustment</value>
+  </data>
+  <data name="menuExport2ShareUrlBase64" xml:space="preserve">
+    <value>Export Base64-encoded Share Links to Clipboard</value>
+  </data>
+  <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
+    <value>Export selected server for complete configuration to clipboard</value>
+  </data>
+  <data name="menuShowOrHideMainWindow" xml:space="preserve">
+    <value>Show or hide the main window</value>
+  </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it!</value>
+  </data>
+  <data name="TbPreSocksPort4Sub" xml:space="preserve">
+    <value>Custom config socks port</value>
+  </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>Backup and Restore</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>Backup to local</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>Restore from local</value>
+  </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>Backup to remote (WebDAV)</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>Restore from remote (WebDAV)</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>Local</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>Remote (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav Url</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav User Name</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav Password</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav Check</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>Remote folder name (optional)</value>
+  </data>
 </root>