v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -86,43 +86,17 @@ public static class ProcUtils
         GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
 
         try
-        {
+        { proc?.Kill(true); }
-            if (Utils.IsNonWindows())
+        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-            {
-                proc?.Kill(true);
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
         try
-        {
+        { proc?.Kill(); }
-            proc?.Kill();
+        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
         try
-        {
+        { proc?.Close(); }
-            proc?.Close();
+        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-
         try
-        {
+        { proc?.Dispose(); }
-            proc?.Dispose();
+        catch (Exception ex) { Logging.SaveLog(_tag, ex); }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
 
         await Task.Delay(300);
         await ProcessKillByKeyInfo(review, procId, fileName, processName);

v2rayN/ServiceLib/Common/Utils.cs

@@ -433,22 +433,10 @@ namespace ServiceLib.Common
         {
             try
             {
-                List<IPEndPoint> lstIpEndPoints = new();
+                var ipProperties = IPGlobalProperties.GetIPGlobalProperties();
-                List<TcpConnectionInformation> lstTcpConns = new();
+                var ipEndPoints = ipProperties.GetActiveTcpListeners();
-
+                //var lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                return ipEndPoints.Any(endPoint => endPoint.Port == port);
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-
-                if (lstIpEndPoints?.FindIndex(it => it.Port == port) >= 0)
-                {
-                    return true;
-                }
-
-                if (lstTcpConns?.FindIndex(it => it.LocalEndPoint.Port == port) >= 0)
-                {
-                    return true;
-                }
             }
             catch (Exception ex)
             {
@@ -798,24 +786,6 @@ namespace ServiceLib.Common
             }
         }
 
-        public static string GetBinConfigPath(string filename = "")
-        {
-            var tempPath = Path.Combine(StartupPath(), "binConfigs");
-            if (!Directory.Exists(tempPath))
-            {
-                Directory.CreateDirectory(tempPath);
-            }
-
-            if (Utils.IsNullOrEmpty(filename))
-            {
-                return tempPath;
-            }
-            else
-            {
-                return Path.Combine(tempPath, filename);
-            }
-        }
-
         #endregion TempPath
 
         #region Platform

v2rayN/ServiceLib/Global.cs

@@ -16,7 +16,7 @@ namespace ServiceLib
         public const string ConfigFileName = "guiNConfig.json";
         public const string CoreConfigFileName = "config.json";
         public const string CorePreConfigFileName = "configPre.json";
-        public const string CoreSpeedtestConfigFileName = "configTest{0}.json";
+        public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
         public const string ClashMixinConfigFileName = "Mixin.yaml";
 
@@ -64,6 +64,8 @@ namespace ServiceLib
         public const string GrpcGunMode = "gun";
         public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
+        public const string DelayUnit = "";
+        public const string SpeedUnit = "";
         public const int MinFontSize = 8;
         public const string RebootAs = "rebootas";
         public const string AvaAssets = "avares://v2rayN/Assets/";
@@ -103,10 +105,10 @@ namespace ServiceLib
 
         public static readonly List<string> SpeedTestUrls =
         [
-            @"https://cachefly.cachefly.net/50mb.test",
-            @"https://speed.cloudflare.com/__down?bytes=10000000",
-            @"https://speed.cloudflare.com/__down?bytes=50000000",
             @"https://speed.cloudflare.com/__down?bytes=100000000",
+            @"https://speed.cloudflare.com/__down?bytes=50000000",
+            @"https://speed.cloudflare.com/__down?bytes=10000000",
+            @"https://cachefly.cachefly.net/50mb.test"
         ];
 
         public static readonly List<string> SpeedPingTestUrls =

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler
 {
     public sealed class AppHandler
     {
@@ -98,7 +98,6 @@ namespace ServiceLib.Handler
             {
                 FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
                 FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
             });
         }
 
@@ -253,4 +252,4 @@ namespace ServiceLib.Handler
 
         #endregion Core Type
     }
-}
+}

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -754,9 +754,9 @@ namespace ServiceLib.Handler
                                   Security = t.Security,
                                   Network = t.Network,
                                   StreamSecurity = t.StreamSecurity,
-                                  Delay = t33?.Delay ?? 0,
+                                  Delay = t33 == null ? 0 : t33.Delay,
-                                  Speed = t33?.Speed ?? 0,
+                                  Speed = t33 == null ? 0 : t33.Speed,
-                                  Sort = t33?.Sort ?? 0
+                                  Sort = t33 == null ? 0 : t33.Sort
                               }).ToList();
 
             Enum.TryParse(colName, true, out EServerColName name);

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler
 {
     /// <summary>
     /// Core configuration file processing class
@@ -109,30 +109,6 @@ namespace ServiceLib.Handler
             return result;
         }
 
-        public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, ProfileItem node, ServerTestItem testItem, string fileName)
-        {
-            var result = new RetResult();
-            var initPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
-            var port = Utils.GetFreePort(initPort + testItem.QueueNum);
-            testItem.Port = port;
-
-            if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
-            {
-                result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
-            }
-            else
-            {
-                result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port);
-            }
-            if (result.Success != true)
-            {
-                return result;
-            }
-
-            await File.WriteAllTextAsync(fileName, result.Data.ToString());
-            return result;
-        }
-
         public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType)
         {
             var result = new RetResult();
@@ -153,4 +129,4 @@ namespace ServiceLib.Handler
             return result;
         }
     }
-}
+}

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -70,7 +70,7 @@ namespace ServiceLib.Handler
                 return;
             }
 
-            var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
+            var fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
             if (result.Success != true)
             {
@@ -101,8 +101,7 @@ namespace ServiceLib.Handler
         public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
             var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
-            var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
+            var configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
-            var configPath = Utils.GetBinConfigPath(fileName);
             var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
             UpdateFunc(false, result.Msg);
             if (result.Success != true)
@@ -114,34 +113,7 @@ namespace ServiceLib.Handler
             UpdateFunc(false, configPath);
 
             var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-            var proc = await RunProcess(coreInfo, fileName, true, false);
+            var proc = await RunProcess(coreInfo, Global.CoreSpeedtestConfigFileName, true, false);
-            if (proc is null)
-            {
-                return -1;
-            }
-
-            return proc.Id;
-        }
-
-        public async Task<int> LoadCoreConfigSpeedtest(ServerTestItem testItem)
-        {
-            var node = await AppHandler.Instance.GetProfileItem(testItem.IndexId);
-            if (node is null)
-            {
-                return -1;
-            }
-
-            var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
-            var configPath = Utils.GetBinConfigPath(fileName);
-            var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, node, testItem, configPath);
-            if (result.Success != true)
-            {
-                return -1;
-            }
-
-            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-            var proc = await CoreHandler.Instance.RunProcess(coreInfo, fileName, true, false);
             if (proc is null)
             {
                 return -1;
@@ -203,7 +175,7 @@ namespace ServiceLib.Handler
                 if (itemSocks != null)
                 {
                     var preCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
-                    var fileName = Utils.GetBinConfigPath(Global.CorePreConfigFileName);
+                    var fileName = Utils.GetConfigPath(Global.CorePreConfigFileName);
                     var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
                     if (result.Success)
                     {
@@ -253,8 +225,8 @@ namespace ServiceLib.Handler
                     StartInfo = new()
                     {
                         FileName = fileName,
-                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath) : configPath),
+                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetConfigPath(configPath) : configPath),
-                        WorkingDirectory = Utils.GetBinConfigPath(),
+                        WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = displayLog,
                         RedirectStandardError = displayLog,
@@ -326,7 +298,7 @@ namespace ServiceLib.Handler
 
         private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
         {
-            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
+            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
 
             var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
             proc.StartInfo.FileName = shFilePath;

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 
 //using System.Reactive.Linq;
 
@@ -8,7 +8,7 @@ namespace ServiceLib.Handler
     {
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
         private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
-        private readonly Queue<string> _queIndexIds = new();
+        private Queue<string> _queIndexIds = new();
         public static ProfileExHandler Instance => _instance.Value;
         private static readonly string _tag = "ProfileExHandler";
 
@@ -59,7 +59,7 @@ namespace ServiceLib.Handler
                 List<ProfileExItem> lstInserts = [];
                 List<ProfileExItem> lstUpdates = [];
 
-                for (var i = 0; i < cnt; i++)
+                for (int i = 0; i < cnt; i++)
                 {
                     var id = _queIndexIds.Dequeue();
                     var item = lstExists.FirstOrDefault(t => t.IndexId == id);
@@ -78,18 +78,13 @@ namespace ServiceLib.Handler
                         lstInserts.Add(itemNew);
                     }
                 }
-
                 try
                 {
-                    if (lstInserts.Count > 0)
+                    if (lstInserts.Count() > 0)
-                    {
                         await SQLiteHelper.Instance.InsertAllAsync(lstInserts);
-                    }
 
-                    if (lstUpdates.Count > 0)
+                    if (lstUpdates.Count() > 0)
-                    {
                         await SQLiteHelper.Instance.UpdateAllAsync(lstUpdates);
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -98,24 +93,17 @@ namespace ServiceLib.Handler
             }
         }
 
-        private ProfileExItem AddProfileEx(string indexId)
+        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
         {
-            var profileEx = new ProfileExItem()
+            profileEx = new()
             {
                 IndexId = indexId,
                 Delay = 0,
                 Speed = 0,
-                Sort = 0,
+                Sort = 0
-                Message = string.Empty
             };
             _lstProfileEx.Add(profileEx);
             IndexIdEnqueue(indexId);
-            return profileEx;
-        }
-
-        private ProfileExItem GetProfileExItem(string? indexId)
-        {
-            return _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId) ?? AddProfileEx(indexId);
         }
 
         public async Task ClearAll()
@@ -136,34 +124,39 @@ namespace ServiceLib.Handler
             }
         }
 
-        public void SetTestDelay(string indexId, int delay)
+        public void SetTestDelay(string indexId, string delayVal)
         {
-            var profileEx = GetProfileExItem(indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
 
+            int.TryParse(delayVal, out int delay);
             profileEx.Delay = delay;
             IndexIdEnqueue(indexId);
         }
 
-        public void SetTestSpeed(string indexId, decimal speed)
+        public void SetTestSpeed(string indexId, string speedVal)
         {
-            var profileEx = GetProfileExItem(indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
 
+            decimal.TryParse(speedVal, out decimal speed);
             profileEx.Speed = speed;
             IndexIdEnqueue(indexId);
         }
 
-        public void SetTestMessage(string indexId, string message)
-        {
-            var profileEx = GetProfileExItem(indexId);
-
-            profileEx.Message = message;
-            IndexIdEnqueue(indexId);
-        }
-
         public void SetSort(string indexId, int sort)
         {
-            var profileEx = GetProfileExItem(indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
-
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
             profileEx.Sort = sort;
             IndexIdEnqueue(indexId);
         }
@@ -187,4 +180,4 @@ namespace ServiceLib.Handler
             return _lstProfileEx.Max(t => t == null ? 0 : t.Sort);
         }
     }
-}
+}

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -156,6 +156,7 @@ namespace ServiceLib.Models
         public int SpeedTestTimeout { get; set; }
         public string SpeedTestUrl { get; set; }
         public string SpeedPingTestUrl { get; set; }
+        public int SpeedTestPageSize { get; set; }
     }
 
     [Serializable]
@@ -243,4 +244,4 @@ namespace ServiceLib.Models
         public string? Length { get; set; }
         public string? Interval { get; set; }
     }
-}
+}

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,4 +1,4 @@
-using SQLite;
+using SQLite;
 
 namespace ServiceLib.Models
 {
@@ -11,6 +11,5 @@ namespace ServiceLib.Models
         public int Delay { get; set; }
         public decimal Speed { get; set; }
         public int Sort { get; set; }
-        public string? Message { get; set; }
     }
-}
+}

v2rayN/ServiceLib/Models/ServerTestItem.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models
 {
     [Serializable]
     public class ServerTestItem
@@ -8,6 +8,6 @@ namespace ServiceLib.Models
         public int Port { get; set; }
         public EConfigType ConfigType { get; set; }
         public bool AllowTest { get; set; }
-        public int QueueNum { get; set; }
+        public int Delay { get; set; }
     }
-}
+}

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -196,7 +196,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to run Core, please check the prompt information 的本地化字符串。
+        ///   查找类似 Failed to run Core, please see the log 的本地化字符串。
         /// </summary>
         public static string FailedToRunCore {
             get {
@@ -3355,6 +3355,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Number per time for auto batch during speedtest(max 1000) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsSpeedTestPageSize {
+            get {
+                return ResourceManager.GetString("TbSettingsSpeedTestPageSize", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SpeedTest Single Timeout Value 的本地化字符串。
         /// </summary>

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

@@ -1372,6 +1372,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>هنگام بستن پنجره در سینی پنهان شوید</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>تعداد در هر زمان برای دسته خودکار در طول تست سرعت (حداکثر 1000)</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>موارد استثنا: از سرور پروکسی برای آدرس های زیر استفاده نکنید. برای جدا کردن ورودی ها از کاما (،) استفاده کنید.</value>
   </data>
@@ -1393,4 +1396,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>شروع آزمایش مجدد قطعات ناموفق، {0} باقی مانده است. برای خاتمه ESC را فشار دهید...</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1372,6 +1372,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>Minimálás tálcára ablak zárásakor</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>Szám / időszak az automatikus batch során a sebességvizsgálat során (maximum 1000)</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>Kivétel. Ne használj proxy szervert a címeknél, évezz pontosvesszőt (,)</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -926,7 +926,7 @@
     <value>Speed(M/s)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
-    <value>Failed to run Core, please check the prompt information</value>
+    <value>Failed to run Core, please see the log</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
     <value>Remarks regular filter</value>
@@ -1372,6 +1372,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>Hide to tray when closing the window</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>Number per time for auto batch during speedtest(max 1000)</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>Exclusions: Do not use proxy server for the following addresses. Use comma (,) to separate entries.</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1372,6 +1372,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>Hide to tray when closing the window</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>Number per time for auto batch during speedtest(max 1000)</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
   </data>

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

@@ -926,7 +926,7 @@
     <value>速度(M/s)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
-    <value>运行 Core 失败，请查看提示信息</value>
+    <value>运行Core失败，请查看日志</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
     <value>别名正则过滤</value>
@@ -1369,6 +1369,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>关闭窗口时隐藏至托盘</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>测试时自动分批的每批数量（最大1000）</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>例外：对于下列地址不使用代理配置文件。使用逗号(,)分隔。</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -927,7 +927,7 @@
     <value>速度(M/s)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
-    <value>執行Core失敗，請查看提示訊息</value>
+    <value>執行Core失敗，請查閲日誌</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
     <value>別名正則過濾</value>
@@ -1370,6 +1370,9 @@
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>關閉視窗時隱藏至托盤</value>
   </data>
+  <data name="TbSettingsSpeedTestPageSize" xml:space="preserve">
+    <value>測試時自動分批的每批數量（最大1000）</value>
+  </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>例外：對於下列位址不使用代理設定檔，使用逗號(,)分隔。</value>
   </data>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -242,66 +242,6 @@ namespace ServiceLib.Services.CoreConfig
             }
         }
 
-        public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
-        {
-            var ret = new RetResult();
-            try
-            {
-                if (node is not { Port: > 0 })
-                {
-                    ret.Msg = ResUI.CheckServerSettings;
-                    return ret;
-                }
-                if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp))
-                {
-                    ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                    return ret;
-                }
-
-                ret.Msg = ResUI.InitialConfiguration;
-
-                var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-                if (Utils.IsNullOrEmpty(result))
-                {
-                    ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                    return ret;
-                }
-
-                var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
-                if (singboxConfig == null)
-                {
-                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                    return ret;
-                }
-
-                await GenLog(singboxConfig);
-                await GenOutbound(node, singboxConfig.outbounds.First());
-                await GenMoreOutbounds(node, singboxConfig);
-                await GenDnsDomains(null, singboxConfig, null);
-
-                singboxConfig.route.rules.Clear();
-                singboxConfig.inbounds.Clear();
-                singboxConfig.inbounds.Add(new()
-                {
-                    tag = $"{EInboundProtocol.mixed}{port}",
-                    listen = Global.Loopback,
-                    listen_port = port,
-                    type = EInboundProtocol.mixed.ToString(),
-                });
-
-                ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-                ret.Success = true;
-                ret.Data = JsonUtils.Serialize(singboxConfig);
-                return ret;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-        }
-
         public async Task<RetResult> GenerateClientMultipleLoadConfig(List<ProfileItem> selecteds)
         {
             var ret = new RetResult();
@@ -1324,7 +1264,7 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.experimental.cache_file = new CacheFile4Sbox()
                 {
                     enabled = true,
-                    path = Utils.GetBinConfigPath("cache.db")
+                    path = Utils.GetConfigPath("cache.db")
                 };
             }
 

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -353,64 +353,6 @@ namespace ServiceLib.Services.CoreConfig
             }
         }
 
-        public async Task<RetResult> GenerateClientSpeedtestConfig(ProfileItem node, int port)
-        {
-            var ret = new RetResult();
-            try
-            {
-                if (node is not { Port: > 0 })
-                {
-                    ret.Msg = ResUI.CheckServerSettings;
-                    return ret;
-                }
-
-                if (node.GetNetwork() is nameof(ETransport.quic))
-                {
-                    ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
-                    return ret;
-                }
-
-                var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-                if (Utils.IsNullOrEmpty(result))
-                {
-                    ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                    return ret;
-                }
-
-                var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-                if (v2rayConfig == null)
-                {
-                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                    return ret;
-                }
-
-                await GenLog(v2rayConfig);
-                await GenOutbound(node, v2rayConfig.outbounds.First());
-                await GenMoreOutbounds(node, v2rayConfig);
-
-                v2rayConfig.routing.rules.Clear();
-                v2rayConfig.inbounds.Clear();
-                v2rayConfig.inbounds.Add(new()
-                {
-                    tag = $"{EInboundProtocol.socks}{port}",
-                    listen = Global.Loopback,
-                    port = port,
-                    protocol = EInboundProtocol.socks.ToString(),
-                });
-
-                ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-                ret.Success = true;
-                ret.Data = JsonUtils.Serialize(v2rayConfig);
-                return ret;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-        }
-
         #endregion public gen function
 
         #region private gen function

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -22,11 +22,12 @@ namespace ServiceLib.Services
         {
             Task.Run(async () =>
             {
-                await RunAsync(actionType, selecteds);
+                var exitLoopKey = Utils.GetGuid(false);
-                await ProfileExHandler.Instance.SaveTo();
+                _lstExitLoop.Add(exitLoopKey);
-                UpdateFunc("", ResUI.SpeedtestingCompleted);
 
-                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
+                var lstSelected = GetClearItem(actionType, selecteds);
+                await RunAsync(actionType, lstSelected, exitLoopKey);
+                UpdateFunc("", ResUI.SpeedtestingCompleted);
             });
         }
 
@@ -40,30 +41,49 @@ namespace ServiceLib.Services
             }
         }
 
-        private async Task RunAsync(ESpeedActionType actionType, List<ProfileItem> selecteds)
+        private async Task RunAsync(ESpeedActionType actionType, List<ServerTestItem> lstSelected, string exitLoopKey, int pageSize = 0)
         {
-            var exitLoopKey = Utils.GetGuid(false);
+            if (actionType == ESpeedActionType.Tcping)
-            _lstExitLoop.Add(exitLoopKey);
-
-            var lstSelected = GetClearItem(actionType, selecteds);
-
-            switch (actionType)
             {
-                case ESpeedActionType.Tcping:
+                await RunTcpingAsync(lstSelected);
-                    await RunTcpingAsync(lstSelected);
+                return;
-                    break;
+            }
 
-                case ESpeedActionType.Realping:
+            if (pageSize <= 0)
-                    await RunRealPingBatchAsync(lstSelected, exitLoopKey);
+            {
-                    break;
+                pageSize = lstSelected.Count < Global.SpeedTestPageSize ? lstSelected.Count : Global.SpeedTestPageSize;
+            }
+            var lstTest = GetTestBatchItem(lstSelected, pageSize);
 
-                case ESpeedActionType.Speedtest:
+            List<ServerTestItem> lstFailed = new();
-                    await RunMixedTestAsync(lstSelected, 1, true, exitLoopKey);
+            foreach (var lst in lstTest)
-                    break;
+            {
+                var ret = actionType switch
+                {
+                    ESpeedActionType.Realping => await RunRealPingAsync(lst, exitLoopKey),
+                    ESpeedActionType.Speedtest => await RunSpeedTestAsync(lst, exitLoopKey),
+                    ESpeedActionType.Mixedtest => await RunMixedTestAsync(lst, exitLoopKey),
+                    _ => true
+                };
+                if (ret == false)
+                {
+                    lstFailed.AddRange(lst);
+                }
+                await Task.Delay(100);
+            }
 
-                case ESpeedActionType.Mixedtest:
+            //Retest the failed part
-                    await RunMixedTestAsync(lstSelected, 6, true, exitLoopKey);
+            var pageSizeNext = pageSize / 2;
-                    break;
+            if (lstFailed.Count > 0 && pageSizeNext > 0)
+            {
+                if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
+                {
+                    UpdateFunc("", ResUI.SpeedtestingSkip);
+                    return;
+                }
+
+                UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
+                await RunAsync(actionType, lstFailed, exitLoopKey, pageSizeNext);
             }
         }
 
@@ -87,8 +107,7 @@ namespace ServiceLib.Services
                     IndexId = it.IndexId,
                     Address = it.Address,
                     Port = it.Port,
-                    ConfigType = it.ConfigType,
+                    ConfigType = it.ConfigType
-                    QueueNum = selecteds.IndexOf(it)
                 });
             }
 
@@ -100,18 +119,18 @@ namespace ServiceLib.Services
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.IndexId, ResUI.Speedtesting, "");
-                        ProfileExHandler.Instance.SetTestDelay(it.IndexId, 0);
+                        ProfileExHandler.Instance.SetTestDelay(it.IndexId, "0");
                         break;
 
                     case ESpeedActionType.Speedtest:
                         UpdateFunc(it.IndexId, "", ResUI.SpeedtestingWait);
-                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, 0);
+                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, "0");
                         break;
 
                     case ESpeedActionType.Mixedtest:
                         UpdateFunc(it.IndexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
-                        ProfileExHandler.Instance.SetTestDelay(it.IndexId, 0);
+                        ProfileExHandler.Instance.SetTestDelay(it.IndexId, "0");
-                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, 0);
+                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, "0");
                         break;
                 }
             }
@@ -119,73 +138,60 @@ namespace ServiceLib.Services
             return lstSelected;
         }
 
-        private async Task RunTcpingAsync(List<ServerTestItem> selecteds)
+        private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
         {
-            List<Task> tasks = [];
+            List<List<ServerTestItem>> lstTest = new();
-            foreach (var it in selecteds)
+            var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)).ToList();
-            {
+            var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard).ToList();
-                if (it.ConfigType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                tasks.Add(Task.Run(async () =>
-                {
-                    try
-                    {
-                        var responseTime = await GetTcpingTime(it.Address, it.Port);
 
-                        ProfileExHandler.Instance.SetTestDelay(it.IndexId, responseTime);
+            for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
-                        UpdateFunc(it.IndexId, responseTime.ToString());
+            {
-                    }
+                lstTest.Add(lst1.Skip(num * pageSize).Take(pageSize).ToList());
-                    catch (Exception ex)
-                    {
-                        Logging.SaveLog(_tag, ex);
-                    }
-                }));
             }
-            Task.WaitAll([.. tasks]);
+            for (var num = 0; num < (int)Math.Ceiling(lst2.Count * 1.0 / pageSize); num++)
-            await Task.CompletedTask;
+            {
+                lstTest.Add(lst2.Skip(num * pageSize).Take(pageSize).ToList());
+            }
+
+            return lstTest;
         }
 
-        private async Task RunRealPingBatchAsync(List<ServerTestItem> lstSelected, string exitLoopKey, int pageSize = 0)
+        private async Task RunTcpingAsync(List<ServerTestItem> selecteds)
         {
-            if (pageSize <= 0)
+            try
             {
-                pageSize = lstSelected.Count < Global.SpeedTestPageSize ? lstSelected.Count : Global.SpeedTestPageSize;
+                List<Task> tasks = [];
+                foreach (var it in selecteds)
+                {
+                    if (it.ConfigType == EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    tasks.Add(Task.Run(async () =>
+                    {
+                        try
+                        {
+                            var time = await GetTcpingTime(it.Address, it.Port);
+                            var output = FormatOut(time, Global.DelayUnit);
+
+                            ProfileExHandler.Instance.SetTestDelay(it.IndexId, output);
+                            UpdateFunc(it.IndexId, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(_tag, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll([.. tasks]);
             }
-            var lstTest = GetTestBatchItem(lstSelected, pageSize);
+            catch (Exception ex)
-
-            List<ServerTestItem> lstFailed = new();
-            foreach (var lst in lstTest)
             {
-                var ret = await RunRealPingAsync(lst, exitLoopKey);
+                Logging.SaveLog(_tag, ex);
-                if (ret == false)
-                {
-                    lstFailed.AddRange(lst);
-                }
-                await Task.Delay(100);
             }
-
+            finally
-            //Retest the failed part
-            var pageSizeNext = pageSize / 2;
-            if (lstFailed.Count > 0 && pageSizeNext > 0)
             {
-                if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
+                await ProfileExHandler.Instance.SaveTo();
-                {
-                    UpdateFunc("", ResUI.SpeedtestingSkip);
-                    return;
-                }
-
-                UpdateFunc("", string.Format(ResUI.SpeedtestingTestFailedPart, lstFailed.Count));
-
-                if (pageSizeNext > 6)
-                {
-                    await RunRealPingBatchAsync(lstFailed, exitLoopKey, pageSizeNext);
-                }
-                else
-                {
-                    await RunMixedTestAsync(lstSelected, 6, false, exitLoopKey);
-                }
             }
         }
 
@@ -215,7 +221,20 @@ namespace ServiceLib.Services
                     }
                     tasks.Add(Task.Run(async () =>
                     {
-                        await DoRealPing(downloadHandle, it);
+                        try
+                        {
+                            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
+                            var output = await GetRealPingTime(downloadHandle, webProxy);
+
+                            ProfileExHandler.Instance.SetTestDelay(it.IndexId, output);
+                            UpdateFunc(it.IndexId, output);
+                            int.TryParse(output, out var delay);
+                            it.Delay = delay;
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(_tag, ex);
+                        }
                     }));
                 }
                 Task.WaitAll(tasks.ToArray());
@@ -230,15 +249,25 @@ namespace ServiceLib.Services
                 {
                     await ProcUtils.ProcessKill(pid);
                 }
+                await ProfileExHandler.Instance.SaveTo();
             }
             return true;
         }
 
-        private async Task RunMixedTestAsync(List<ServerTestItem> selecteds, int concurrencyCount, bool blSpeedTest, string exitLoopKey)
+        private async Task<bool> RunSpeedTestAsync(List<ServerTestItem> selecteds, string exitLoopKey)
         {
-            using var concurrencySemaphore = new SemaphoreSlim(concurrencyCount);
+            var pid = -1;
-            var downloadHandle = new DownloadService();
+            pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(selecteds);
-            List<Task> tasks = new();
+            if (pid < 0)
+            {
+                return false;
+            }
+
+            var url = _config.SpeedTestItem.SpeedTestUrl;
+            var timeout = _config.SpeedTestItem.SpeedTestTimeout;
+
+            DownloadService downloadHandle = new();
+
             foreach (var it in selecteds)
             {
                 if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
@@ -246,74 +275,135 @@ namespace ServiceLib.Services
                     UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
                     continue;
                 }
+
+                if (!it.AllowTest)
+                {
+                    continue;
+                }
                 if (it.ConfigType == EConfigType.Custom)
                 {
                     continue;
                 }
-                await concurrencySemaphore.WaitAsync();
+                //if (it.delay < 0)
+                //{
+                //    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                //    continue;
+                //}
+                ProfileExHandler.Instance.SetTestSpeed(it.IndexId, "-1");
+                UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
 
-                tasks.Add(Task.Run(async () =>
+                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                if (item is null)
+                    continue;
+
+                var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
+
+                await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>
                 {
-                    var pid = -1;
+                    decimal.TryParse(msg, out var dec);
-                    try
+                    if (dec > 0)
                     {
-                        pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(it);
+                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, msg);
-                        if (pid > 0)
-                        {
-                            await Task.Delay(500);
-                            await DoRealPing(downloadHandle, it);
-                            if (blSpeedTest)
-                            {
-                                await DoSpeedTest(downloadHandle, it);
-                            }
-                        }
-                        else
-                        {
-                            UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
-                        }
                     }
-                    catch (Exception ex)
+                    UpdateFunc(it.IndexId, "", msg);
-                    {
+                });
-                        Logging.SaveLog(_tag, ex);
-                    }
-                    finally
-                    {
-                        if (pid > 0)
-                        {
-                            await ProcUtils.ProcessKill(pid);
-                        }
-                        concurrencySemaphore.Release();
-                    }
-                }));
             }
-            Task.WaitAll(tasks.ToArray());
+
+            if (pid > 0)
+            {
+                await ProcUtils.ProcessKill(pid);
+            }
+            await ProfileExHandler.Instance.SaveTo();
+            return true;
         }
 
-        private async Task DoRealPing(DownloadService downloadHandle, ServerTestItem it)
+        private async Task<bool> RunSpeedTestMultiAsync(List<ServerTestItem> selecteds, string exitLoopKey)
         {
-            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
+            var pid = -1;
-            var responseTime = await downloadHandle.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
+            pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(selecteds);
+            if (pid < 0)
+            {
+                return false;
+            }
 
-            ProfileExHandler.Instance.SetTestDelay(it.IndexId, responseTime);
-            UpdateFunc(it.IndexId, responseTime.ToString());
-        }
-
-        private async Task DoSpeedTest(DownloadService downloadHandle, ServerTestItem it)
-        {
-            UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
-
-            var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
             var url = _config.SpeedTestItem.SpeedTestUrl;
             var timeout = _config.SpeedTestItem.SpeedTestTimeout;
-            await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>
+
+            DownloadService downloadHandle = new();
+
+            foreach (var it in selecteds)
             {
-                decimal.TryParse(msg, out var dec);
+                if (_lstExitLoop.Any(p => p == exitLoopKey) == false)
-                if (dec > 0)
                 {
-                    ProfileExHandler.Instance.SetTestSpeed(it.IndexId, dec);
+                    UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                    continue;
                 }
-                UpdateFunc(it.IndexId, "", msg);
+
-            });
+                if (!it.AllowTest)
+                {
+                    continue;
+                }
+                if (it.ConfigType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.Delay < 0)
+                {
+                    UpdateFunc(it.IndexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+                ProfileExHandler.Instance.SetTestSpeed(it.IndexId, "-1");
+                UpdateFunc(it.IndexId, "", ResUI.Speedtesting);
+
+                var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
+                if (item is null)
+                    continue;
+
+                var webProxy = new WebProxy($"socks5://{Global.Loopback}:{it.Port}");
+                _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, (success, msg) =>
+                {
+                    decimal.TryParse(msg, out var dec);
+                    if (dec > 0)
+                    {
+                        ProfileExHandler.Instance.SetTestSpeed(it.IndexId, msg);
+                    }
+                    UpdateFunc(it.IndexId, "", msg);
+                });
+                await Task.Delay(2000);
+            }
+
+            await Task.Delay((timeout + 2) * 1000);
+
+            if (pid > 0)
+            {
+                await ProcUtils.ProcessKill(pid);
+            }
+            await ProfileExHandler.Instance.SaveTo();
+            return true;
+        }
+
+        private async Task<bool> RunMixedTestAsync(List<ServerTestItem> selecteds, string exitLoopKey)
+        {
+            var ret = await RunRealPingAsync(selecteds, exitLoopKey);
+            if (ret == false)
+            {
+                return false;
+            }
+
+            await Task.Delay(1000);
+
+            var ret2 = await RunSpeedTestMultiAsync(selecteds, exitLoopKey);
+            if (ret2 == false)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        private async Task<string> GetRealPingTime(DownloadService downloadHandle, IWebProxy webProxy)
+        {
+            var responseTime = await downloadHandle.GetRealPingTime(_config.SpeedTestItem.SpeedPingTestUrl, webProxy, 10);
+            return FormatOut(responseTime, Global.DelayUnit);
         }
 
         private async Task<int> GetTcpingTime(string url, int port)
@@ -335,10 +425,7 @@ namespace ServiceLib.Services
 
                 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();
@@ -351,31 +438,14 @@ namespace ServiceLib.Services
             return responseTime;
         }
 
-        private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
+        private string FormatOut(object time, string unit)
         {
-            List<List<ServerTestItem>> lstTest = new();
+            return $"{time}";
-            var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)).ToList();
-            var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard).ToList();
-
-            for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
-            {
-                lstTest.Add(lst1.Skip(num * pageSize).Take(pageSize).ToList());
-            }
-            for (var num = 0; num < (int)Math.Ceiling(lst2.Count * 1.0 / pageSize); num++)
-            {
-                lstTest.Add(lst2.Skip(num * pageSize).Take(pageSize).ToList());
-            }
-
-            return lstTest;
         }
 
         private void UpdateFunc(string indexId, string delay, string speed = "")
         {
             _updateFunc?.Invoke(new() { IndexId = indexId, Delay = delay, Speed = speed });
-            if (indexId.IsNotEmpty() && speed.IsNotEmpty())
-            {
-                ProfileExHandler.Instance.SetTestMessage(indexId, speed);
-            }
         }
     }
 }

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -173,7 +173,7 @@ namespace ServiceLib.ViewModels
             var configDirZipTemp = Utils.GetTempPath($"v2rayN_{DateTime.Now:yyyyMMddHHmmss}");
             var configDirTemp = Path.Combine(configDirZipTemp, _guiConfigs);
 
-            FileManager.CopyDirectory(configDir, configDirTemp, false, true, "");
+            FileManager.CopyDirectory(configDir, configDirTemp, false, true, "cache.db");
             var ret = FileManager.CreateFromDirectory(configDirZipTemp, fileName);
             Directory.Delete(configDirZipTemp, true);
             return await Task.FromResult(ret);

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -63,6 +63,7 @@ namespace ServiceLib.ViewModels
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
         [Reactive] public string SpeedPingTestUrl { get; set; }
+        //[Reactive] public int SpeedTestPageSize { get; set; }
         [Reactive] public bool EnableHWA { get; set; }
         [Reactive] public string SubConvertUrl { get; set; }
         [Reactive] public int MainGirdOrientation { get; set; }
@@ -177,6 +178,7 @@ namespace ServiceLib.ViewModels
             CurrentFontFamily = _config.UiItem.CurrentFontFamily;
             SpeedTestTimeout = _config.SpeedTestItem.SpeedTestTimeout;
             SpeedTestUrl = _config.SpeedTestItem.SpeedTestUrl;
+            //SpeedTestPageSize = _config.SpeedTestItem.SpeedTestPageSize;
             SpeedPingTestUrl = _config.SpeedTestItem.SpeedPingTestUrl;
             EnableHWA = _config.GuiItem.EnableHWA;
             SubConvertUrl = _config.ConstItem.SubConvertUrl;
@@ -330,6 +332,7 @@ namespace ServiceLib.ViewModels
             _config.GuiItem.TrayMenuServersLimit = TrayMenuServersLimit;
             _config.UiItem.CurrentFontFamily = CurrentFontFamily;
             _config.SpeedTestItem.SpeedTestTimeout = SpeedTestTimeout;
+            //_config.SpeedTestItem.SpeedTestPageSize = SpeedTestPageSize;
             _config.SpeedTestItem.SpeedTestUrl = SpeedTestUrl;
             _config.SpeedTestItem.SpeedPingTestUrl = SpeedPingTestUrl;
             _config.GuiItem.EnableHWA = EnableHWA;

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -269,22 +269,20 @@ namespace ServiceLib.ViewModels
                 return;
             }
             var item = _profileItems.FirstOrDefault(it => it.IndexId == result.IndexId);
-            if (item == null)
+            if (item != null)
             {
-                return;
+                if (Utils.IsNotEmpty(result.Delay))
+                {
+                    int.TryParse(result.Delay, out int temp);
+                    item.Delay = temp;
+                    item.DelayVal = $"{result.Delay} {Global.DelayUnit}";
+                }
+                if (Utils.IsNotEmpty(result.Speed))
+                {
+                    item.SpeedVal = $"{result.Speed} {Global.SpeedUnit}";
+                }
+                _profileItems.Replace(item, JsonUtils.DeepCopy(item));
             }
-
-            if (Utils.IsNotEmpty(result.Delay))
-            {
-                int.TryParse(result.Delay, out var temp);
-                item.Delay = temp;
-                item.DelayVal = result.Delay ?? string.Empty;
-            }
-            if (Utils.IsNotEmpty(result.Speed))
-            {
-                item.SpeedVal = result.Speed ?? string.Empty;
-            }
-            _profileItems.Replace(item, JsonUtils.DeepCopy(item));
         }
 
         public void UpdateStatistics(ServerSpeedItem update)
@@ -423,11 +421,10 @@ namespace ServiceLib.ViewModels
                             Subid = t.Subid,
                             SubRemarks = t.SubRemarks,
                             IsActive = t.IndexId == _config.IndexId,
-                            Sort = t33?.Sort ?? 0,
+                            Sort = t33 == null ? 0 : t33.Sort,
-                            Delay = t33?.Delay ?? 0,
+                            Delay = t33 == null ? 0 : t33.Delay,
-                            Speed = t33?.Speed ?? 0,
+                            DelayVal = t33?.Delay != 0 ? $"{t33?.Delay} {Global.DelayUnit}" : string.Empty,
-                            DelayVal = t33?.Delay != 0 ? $"{t33?.Delay}" : string.Empty,
+                            SpeedVal = t33?.Speed != 0 ? $"{t33?.Speed} {Global.SpeedUnit}" : string.Empty,
-                            SpeedVal = t33?.Speed > 0 ? $"{t33?.Speed}" : t33?.Message ?? string.Empty,
                             TodayDown = t22 == null ? "" : Utils.HumanFy(t22.TodayDown),
                             TodayUp = t22 == null ? "" : Utils.HumanFy(t22.TodayUp),
                             TotalDown = t22 == null ? "" : Utils.HumanFy(t22.TotalDown),

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -518,7 +518,21 @@
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyLinuxTip}"
                             TextWrapping="Wrap" />
-                  
+                        <!--
+                        <TextBlock
+                            Grid.Row="16"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Classes="Margin8"
+                            Text="{x:Static resx:ResUI.TbSettingsSpeedTestPageSize}" />
+                        <TextBox
+                            x:Name="txtSpeedTestPageSize"
+                            Grid.Row="16"
+                            Grid.Column="1"
+                            Width="200"
+                            HorizontalAlignment="Left"
+                            Classes="Margin8" />
+                        -->
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -139,6 +139,7 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.SelectedValue).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.SpeedTestPageSize, v => v.txtSpeedTestPageSize.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -776,7 +776,23 @@
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}"
                             TextWrapping="Wrap" />
-                       
+                        <!--
+                        <TextBlock
+                            Grid.Row="16"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsSpeedTestPageSize}" />
+                        <TextBox
+                            x:Name="txtSpeedTestPageSize"
+                            Grid.Row="16"
+                            Grid.Column="1"
+                            Width="200"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left"
+                            Style="{StaticResource DefTextBox}" />
+                        -->
                         <TextBlock
                             Grid.Row="17"
                             Grid.Column="0"

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -150,6 +150,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
+                //this.Bind(ViewModel, vm => vm.SpeedTestPageSize, v => v.txtSpeedTestPageSize.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);