up 7.6.2

InitCoreInfo()

.github/workflows/build-windows.yml

@@ -29,6 +29,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Setup
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
+
     - name: Build
       run: |
         cd v2rayN 

v2rayN/ServiceLib/Common/FileManager.cs

@@ -196,5 +196,26 @@ namespace ServiceLib.Common
                 }
             }
         }
+
+        public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
+        {
+            try
+            {
+                var files = Directory.GetFiles(sourceDir, "*.*");
+                foreach (var filePath in files)
+                {
+                    var file = new FileInfo(filePath);
+                    if (file.CreationTime >= dtLine)
+                    {
+                        continue;
+                    }
+                    file.Delete();
+                }
+            }
+            catch
+            {
+                // ignored
+            }
+        }
     }
 }

v2rayN/ServiceLib/Common/Logging.cs

@@ -25,36 +25,6 @@ namespace ServiceLib.Common
             }
         }
 
-        public static void ClearLogs()
-        {
-            Task.Run(() =>
-            {
-                try
-                {
-                    var now = DateTime.Now.AddMonths(-1);
-                    var dir = Utils.GetLogPath();
-                    var files = Directory.GetFiles(dir, "*.txt");
-                    foreach (var filePath in files)
-                    {
-                        var file = new FileInfo(filePath);
-                        if (file.CreationTime >= now) continue;
-                        try
-                        {
-                            file.Delete();
-                        }
-                        catch
-                        {
-                            // ignored
-                        }
-                    }
-                }
-                catch
-                {
-                    // ignored
-                }
-            });
-        }
-
         public static void SaveLog(string strContent)
         {
             if (!LogManager.IsLoggingEnabled()) return;

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -79,7 +79,8 @@
         {
             Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
             Logging.LoggingEnabled(_config.GuiItem.EnableLog);
-            Logging.ClearLogs();
+
+            ClearExpiredFiles();
 
             return true;
         }
@@ -91,6 +92,15 @@
             return true;
         }
 
+        private void ClearExpiredFiles()
+        {
+            Task.Run(() =>
+            {
+                FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
+                FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
+            });
+        }
+
         #endregion Init
 
         #region Config
@@ -125,7 +135,7 @@
             return await SQLiteHelper.Instance.TableAsync<SubItem>().OrderBy(t => t.Sort).ToListAsync();
         }
 
-        public async Task<SubItem?> GetSubItem(string subid)
+        public async Task<SubItem?> GetSubItem(string? subid)
         {
             return await SQLiteHelper.Instance.TableAsync<SubItem>().FirstOrDefaultAsync(t => t.Id == subid);
         }
@@ -170,45 +180,6 @@
             return await SQLiteHelper.Instance.QueryAsync<ProfileItemModel>(sql);
         }
 
-        public async Task<List<ProfileItemModel>?> ProfileItemsEx(string subid, string filter)
-        {
-            var lstModel = await ProfileItems(_config.SubIndexId, filter);
-
-            await ConfigHandler.SetDefaultServer(_config, lstModel);
-
-            var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
-            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 async Task<ProfileItem?> GetProfileItem(string indexId)
         {
             if (Utils.IsNullOrEmpty(indexId))

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -45,6 +45,8 @@ namespace ServiceLib.Handler
             {
                 AutoStartTaskService(autoRunName, "", "");
             }
+
+            await Task.CompletedTask;
         }
 
         private static async Task SetTaskWindows()
@@ -66,6 +68,7 @@ namespace ServiceLib.Handler
             {
                 Logging.SaveLog(_tag, ex);
             }
+            await Task.CompletedTask;
         }
 
         /// <summary>
@@ -127,6 +130,7 @@ namespace ServiceLib.Handler
             {
                 Logging.SaveLog(_tag, ex);
             }
+            await Task.CompletedTask;
         }
 
         private static async Task SetTaskLinux()

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -94,10 +94,7 @@ namespace ServiceLib.Handler
                 EnableTun = false,
                 Mtu = 9000,
             };
-            config.GuiItem ??= new()
-            {
-                EnableStatistics = false,
-            };
+            config.GuiItem ??= new();
             config.MsgUIItem ??= new();
 
             config.UiItem ??= new UIItem()
@@ -162,7 +159,7 @@ namespace ServiceLib.Handler
                 Length = "100-200",
                 Interval = "10-20"
             };
-             
+
             if (config.SystemProxyItem.SystemProxyExceptions.IsNullOrEmpty())
             {
                 config.SystemProxyItem.SystemProxyExceptions = Utils.IsWindows() ? Global.SystemProxyExceptionsWindows : Global.SystemProxyExceptionsLinux;
@@ -472,7 +469,7 @@ namespace ServiceLib.Handler
             }
 
             ProfileExHandler.Instance.SetSort(lstProfile[index].IndexId, sort);
-            return 0;
+            return await Task.FromResult(0);
         }
 
         /// <summary>
@@ -1050,7 +1047,7 @@ namespace ServiceLib.Handler
                     Port = node.PreSocksPort.Value,
                 };
             }
-
+            await Task.CompletedTask;
             return itemSocks;
         }
 
@@ -1620,7 +1617,7 @@ namespace ServiceLib.Handler
                         break;
                     }
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         public static async Task<int> SetDefaultRouting(Config config, RoutingItem routingItem)

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -80,7 +80,7 @@
 
                 ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
                 ret.Success = true;
-                return ret;
+                return await Task.FromResult(ret);
             }
             catch (Exception ex)
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -67,13 +67,17 @@ namespace ServiceLib.Handler
                 return;
             }
 
-            UpdateFunc(true, $"{node.GetSummary()}");
+            UpdateFunc(false, $"{node.GetSummary()}");
             UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
             UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
             await CoreStop();
             await Task.Delay(100);
             await CoreStart(node);
             await CoreStartPreService(node);
+            if (_process != null)
+            {
+                UpdateFunc(true, $"{node.GetSummary()}");
+            }
         }
 
         public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
@@ -220,8 +224,6 @@ namespace ServiceLib.Handler
                     await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
                 }
 
-                var startUpErrorMessage = new StringBuilder();
-                var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
@@ -233,11 +235,6 @@ namespace ServiceLib.Handler
                     {
                         if (Utils.IsNullOrEmpty(e.Data)) return;
                         UpdateFunc(false, e.Data + Environment.NewLine);
-
-                        if (!startUpSuccessful)
-                        {
-                            startUpErrorMessage.Append(e.Data + Environment.NewLine);
-                        }
                     };
                 }
                 proc.Start();
@@ -258,18 +255,12 @@ namespace ServiceLib.Handler
                     proc.BeginErrorReadLine();
                 }
 
+                await Task.Delay(500);
                 AppHandler.Instance.AddProcess(proc.Handle);
-                if (proc.WaitForExit(1000))
+                if (proc is null or { HasExited: true })
                 {
-                    proc.CancelErrorRead();
-                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    throw new Exception(ResUI.FailedToRunCore);
                 }
-                else
-                {
-                    startUpSuccessful = true;
-                }
-
-                AppHandler.Instance.AddProcess(proc.Handle);
                 return proc;
             }
             catch (Exception ex)

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -52,144 +52,146 @@
 
         private void InitCoreInfo()
         {
-            _coreInfo = [];
+            _coreInfo =
+            [
+                new CoreInfo
+                {
+                    CoreType = ECoreType.v2rayN,
+                    Url = Global.NUrl,
+                    ReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    DownloadUrlWin64 = Global.NUrl + "/download/{0}/v2rayN-windows-64.zip",
+                    DownloadUrlWinArm64 = Global.NUrl + "/download/{0}/v2rayN-windows-arm64.zip",
+                    DownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
+                    DownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
+                    DownloadUrlOSX64 = Global.NUrl + "/download/{0}/v2rayN-macos-64.zip",
+                    DownloadUrlOSXArm64 = Global.NUrl + "/download/{0}/v2rayN-macos-arm64.zip",
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.v2rayN,
-                Url = Global.NUrl,
-                ReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.NUrl + "/download/{0}/v2rayN-windows-64.zip",
-                DownloadUrlWinArm64 = Global.NUrl + "/download/{0}/v2rayN-windows-arm64.zip",
-                DownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
-                DownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
-                DownloadUrlOSX64 = Global.NUrl + "/download/{0}/v2rayN-macos-64.zip",
-                DownloadUrlOSXArm64 = Global.NUrl + "/download/{0}/v2rayN-macos-arm64.zip",
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.v2fly,
+                    CoreExes = ["wv2ray", "v2ray"],
+                    Arguments = "",
+                    Url = Global.V2flyCoreUrl,
+                    ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    Match = "V2Ray",
+                    VersionArg = "-version",
+                    RedirectInfo = true,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.v2fly,
-                CoreExes = new List<string> { "wv2ray", "v2ray" },
-                Arguments = "",
-                Url = Global.V2flyCoreUrl,
-                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                Match = "V2Ray",
-                VersionArg = "-version",
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.v2fly_v5,
+                    CoreExes = ["v2ray"],
+                    Arguments = "run -c config.json -format jsonv5",
+                    Url = Global.V2flyCoreUrl,
+                    ReleaseApiUrl = Global.V2flyCoreUrl.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",
-                Url = Global.V2flyCoreUrl,
-                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                Match = "V2Ray",
-                VersionArg = "version",
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.Xray,
+                    CoreExes = ["xray", "wxray"],
+                    Arguments = "run -c {0}",
+                    Url = Global.XrayCoreUrl,
+                    ReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    DownloadUrlWin64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
+                    DownloadUrlWinArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
+                    DownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
+                    DownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
+                    DownloadUrlOSX64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-64.zip",
+                    DownloadUrlOSXArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-arm64-v8a.zip",
+                    Match = "Xray",
+                    VersionArg = "-version",
+                    RedirectInfo = true,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.Xray,
-                CoreExes = new List<string> { "xray", "wxray" },
-                Arguments = "run -c {0}",
-                Url = Global.XrayCoreUrl,
-                ReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
-                DownloadUrlWinArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
-                DownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
-                DownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
-                DownloadUrlOSX64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-64.zip",
-                DownloadUrlOSXArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-arm64-v8a.zip",
-                Match = "Xray",
-                VersionArg = "-version",
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.mihomo,
+                    CoreExes = ["mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "mihomo", "clash"],
+                    Arguments = "-f config.json" + PortableMode(),
+                    Url = Global.MihomoCoreUrl,
+                    ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    DownloadUrlWin64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                    DownloadUrlWinArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
+                    DownloadUrlLinux64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                    DownloadUrlLinuxArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
+                    DownloadUrlOSX64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
+                    DownloadUrlOSXArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
+                    Match = "Mihomo",
+                    VersionArg = "-v",
+                    RedirectInfo = true,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.mihomo,
-                CoreExes = new List<string> { "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "mihomo", "clash" },
-                Arguments = "-f config.json" + PortableMode(),
-                Url = Global.MihomoCoreUrl,
-                ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
-                DownloadUrlWinArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
-                DownloadUrlLinux64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
-                DownloadUrlLinuxArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
-                DownloadUrlOSX64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
-                DownloadUrlOSXArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
-                Match = "Mihomo",
-                VersionArg = "-v",
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.hysteria,
+                    CoreExes = ["hysteria-windows-amd64", "hysteria"],
+                    Arguments = "",
+                    Url = Global.HysteriaCoreUrl,
+                    ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    RedirectInfo = true,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.hysteria,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria" },
-                Arguments = "",
-                Url = Global.HysteriaCoreUrl,
-                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.naiveproxy,
+                    CoreExes = ["naiveproxy", "naive"],
+                    Arguments = "config.json",
+                    Url = Global.NaiveproxyCoreUrl,
+                    RedirectInfo = false,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.naiveproxy,
-                CoreExes = new List<string> { "naiveproxy", "naive" },
-                Arguments = "config.json",
-                Url = Global.NaiveproxyCoreUrl,
-                RedirectInfo = false,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.tuic,
+                    CoreExes = ["tuic-client", "tuic"],
+                    Arguments = "-c config.json",
+                    Url = Global.TuicCoreUrl,
+                    RedirectInfo = true,
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.tuic,
-                CoreExes = new List<string> { "tuic-client", "tuic" },
-                Arguments = "-c config.json",
-                Url = Global.TuicCoreUrl,
-                RedirectInfo = true,
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.sing_box,
+                    CoreExes = ["sing-box-client", "sing-box"],
+                    Arguments = "run -c {0} --disable-color",
+                    Url = Global.SingboxCoreUrl,
+                    RedirectInfo = true,
+                    ReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    DownloadUrlWin64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
+                    DownloadUrlWinArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                    DownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
+                    DownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
+                    DownloadUrlOSX64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
+                    DownloadUrlOSXArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
+                    Match = "sing-box",
+                    VersionArg = "version",
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.sing_box,
-                CoreExes = new List<string> { "sing-box-client", "sing-box" },
-                Arguments = "run -c {0} --disable-color",
-                Url = Global.SingboxCoreUrl,
-                RedirectInfo = true,
-                ReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
-                DownloadUrlWinArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
-                DownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
-                DownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
-                DownloadUrlOSX64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
-                DownloadUrlOSXArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
-                Match = "sing-box",
-                VersionArg = "version",
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.juicity,
+                    CoreExes = ["juicity-client", "juicity"],
+                    Arguments = "run -c config.json",
+                    Url = Global.JuicityCoreUrl
+                },
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.juicity,
-                CoreExes = new List<string> { "juicity-client", "juicity" },
-                Arguments = "run -c config.json",
-                Url = Global.JuicityCoreUrl
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.hysteria2,
+                    CoreExes = ["hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria"],
+                    Arguments = "",
+                    Url = Global.HysteriaCoreUrl,
+                    ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    RedirectInfo = true,
+                }
 
-            _coreInfo.Add(new CoreInfo
-            {
-                CoreType = ECoreType.hysteria2,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria" },
-                Arguments = "",
-                Url = Global.HysteriaCoreUrl,
-                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                RedirectInfo = true,
-            });
+            ];
         }
 
         private string PortableMode()

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -20,7 +20,7 @@ namespace ServiceLib.Handler
         public async Task Init()
         {
             await InitData();
-            Task.Run(async () =>
+            _ = Task.Run(async () =>
             {
                 while (true)
                 {
@@ -32,7 +32,7 @@ namespace ServiceLib.Handler
 
         public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
         {
-            return _lstProfileEx;
+            return await Task.FromResult(_lstProfileEx);
         }
 
         private async Task InitData()

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -19,15 +19,13 @@
         {
             _config = config;
             _updateFunc = updateFunc;
-            if (!config.GuiItem.EnableStatistics)
+            if (config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
             {
-                return;
+                await InitData();
+
+                _statisticsXray = new StatisticsXrayService(config, UpdateServerStatHandler);
+                _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);
             }
-
-            await InitData();
-
-            _statisticsXray = new StatisticsXrayService(config, UpdateServerStatHandler);
-            _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);
         }
 
         public void Close()
@@ -72,7 +70,7 @@
                 return;
             }
 
-            if(indexId == toIndexId)
+            if (indexId == toIndexId)
             {
                 return;
             }
@@ -101,7 +99,7 @@
 
         private void UpdateServerStatHandler(ServerSpeedItem server)
         {
-            UpdateServerStat(server);
+            _ = UpdateServerStat(server);
         }
 
         private async Task UpdateServerStat(ServerSpeedItem server)

v2rayN/ServiceLib/Models/ClashConnections.cs

@@ -29,7 +29,7 @@
         public string? destinationPort { get; set; }
         public string? host { get; set; }
         public string? nsMode { get; set; }
-        public object uid { 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/ConfigItems.cs

@@ -67,21 +67,13 @@
     public class GUIItem
     {
         public bool AutoRun { get; set; }
-
         public bool EnableStatistics { get; set; }
-
+        public bool DisplayRealTimeSpeed { get; set; }
         public bool KeepOlderDedupl { get; set; }
-
-        public bool IgnoreGeoUpdateCore { get; set; } = true;
-
         public int AutoUpdateInterval { get; set; }
-
         public bool EnableSecurityProtocolTls13 { get; set; }
-
         public int TrayMenuServersLimit { get; set; } = 20;
-
         public bool EnableHWA { get; set; } = false;
-
         public bool EnableLog { get; set; } = true;
     }
 

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2914,6 +2914,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Display real-time speed 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDisplayRealTimeSpeed {
+            get {
+                return ResourceManager.GetString("TbSettingsDisplayRealTimeSpeed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Outbound DNS address 的本地化字符串。
         /// </summary>
@@ -3112,15 +3121,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Ignore Geo files when updating core 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsIgnoreGeoUpdateCore {
-            get {
-                return ResourceManager.GetString("TbSettingsIgnoreGeoUpdateCore", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Keep older when deduplication 的本地化字符串。
         /// </summary>
@@ -3401,7 +3401,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Enable Statistics (Require restart) 的本地化字符串。
+        ///   查找类似 Enable traffic statistics (Require restart) 的本地化字符串。
         /// </summary>
         public static string TbSettingsStatistics {
             get {

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

@@ -718,8 +718,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>پورت Http</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>هنگام به‌روزرسانی هسته، فایل‌های Geo را نادیده بگیرید</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>Display real-time speed</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>هنگام کپی برداری، نگه داری قدیمی تر ها</value>
@@ -1393,4 +1393,4 @@
   <data name="menuCopyProxyCmdToClipboard" xml:space="preserve">
     <value>کپی کردن دستور پروکسی در کلیپ بورد</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -718,8 +718,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>HTTP Port</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>Geo fájlok figyelmen kívül hagyása a yalap frissítésekor</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>Display real-time speed</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Régi megőrzése a deduplikáció során</value>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -718,8 +718,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>HTTP Port</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>Ignore Geo files when updating core</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>Display real-time speed (Require restart)</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Keep older when deduplication</value>
@@ -755,7 +755,7 @@
     <value>Start on boot</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>Enable Statistics (Require restart)</value>
+    <value>Enable traffic statistics (Require restart)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>Subscription conversion URL</value>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -724,8 +724,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>HTTP порт</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>Игнорировать файлы Geo при обновлении ядра</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>Display real-time speed</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Сохранить старые при удалении дублей</value>

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

@@ -718,8 +718,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>本地http监听端口</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>更新Core时忽略Geo文件</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>显示实时速度（需重启）</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重时保留序号较小的项</value>
@@ -755,7 +755,7 @@
     <value>开机启动(可能会不成功)</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>启用统计(实时网速显示，需重启)</value>
+    <value>启用流量统计（需重启）</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>订阅转换网址(可选)</value>

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

@@ -719,8 +719,8 @@
   <data name="TbSettingsHttpPort" xml:space="preserve">
     <value>本機HTTP偵聽埠</value>
   </data>
-  <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>更新Core時忽略Geo檔案</value>
+  <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
+    <value>顯示即時速度（需重啟）</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重時保留序號較小的項</value>
@@ -756,7 +756,7 @@
     <value>開機啟動(可能會不成功)</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>啟用統計(即時網速顯示，需重啟)</value>
+    <value>啟用流量統計（需重啟）</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>訂閱轉換網址(可選)</value>

v2rayN/ServiceLib/Sample/dns_singbox_normal

@@ -2,7 +2,7 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "8.8.8.8",
+      "address": "tcp://8.8.8.8",
       "strategy": "prefer_ipv4",
       "detour": "proxy"
     },
@@ -32,4 +32,4 @@
     }
   ],
   "final": "remote"
-}
+}

v2rayN/ServiceLib/Sample/tun_singbox_dns

@@ -2,7 +2,7 @@
   "servers": [
     {
       "tag": "remote",
-      "address": "8.8.8.8",
+      "address": "tcp://8.8.8.8",
       "strategy": "prefer_ipv4",
       "detour": "proxy"
     },
@@ -33,4 +33,4 @@
     }
   ],
   "final": "remote"
-}
+}

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.6.1</Version>
+	<Version>7.6.2</Version>
   </PropertyGroup>
  
 	<ItemGroup>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -476,7 +476,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenInbounds(SingboxConfig singboxConfig)
@@ -721,7 +721,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
@@ -771,7 +771,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
@@ -848,7 +848,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
@@ -1088,7 +1088,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private bool ParseV2Domain(string domain, Rule4Sbox rule)
@@ -1240,7 +1240,7 @@ namespace ServiceLib.Services.CoreConfig
             }
 
             singboxConfig.dns = dns4Sbox;
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenExperimental(SingboxConfig singboxConfig)
@@ -1264,7 +1264,7 @@ namespace ServiceLib.Services.CoreConfig
                 };
             }
 
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> ConvertGeo2Ruleset(SingboxConfig singboxConfig)

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -379,7 +379,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenInbounds(V2rayConfig v2rayConfig)
@@ -423,7 +423,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private Inbounds4Ray GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
@@ -560,7 +560,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
@@ -774,7 +774,7 @@ namespace ServiceLib.Services.CoreConfig
             {
                 Logging.SaveLog(_tag, ex);
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray outbound)
@@ -1103,12 +1103,12 @@ namespace ServiceLib.Services.CoreConfig
                     servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
                 }
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenStatistic(V2rayConfig v2rayConfig)
         {
-            if (_config.GuiItem.EnableStatistics)
+            if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
             {
                 string tag = EInboundProtocol.api.ToString();
                 Metrics4Ray apiObj = new();
@@ -1150,7 +1150,7 @@ namespace ServiceLib.Services.CoreConfig
                     v2rayConfig.routing.rules.Add(apiRoutingRule);
                 }
             }
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private async Task<int> GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -25,6 +25,7 @@ namespace ServiceLib.ViewModels
             BrowseServerCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 _updateView?.Invoke(EViewAction.BrowseServer, null);
+                await Task.CompletedTask;
             });
             EditServerCmd = ReactiveCommand.CreateFromTask(async () =>
             {
@@ -109,6 +110,7 @@ namespace ServiceLib.ViewModels
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FailedReadConfiguration);
             }
+            await Task.CompletedTask;
         }
     }
 }

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -176,7 +176,7 @@ namespace ServiceLib.ViewModels
             FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db");
             var ret = FileManager.CreateFromDirectory(configDirZipTemp, fileName);
             Directory.Delete(configDirZipTemp, true);
-            return ret;
+            return await Task.FromResult(ret);
         }
     }
 }

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -259,7 +259,7 @@ namespace ServiceLib.ViewModels
                 }
                 else
                 {
-                    FileManager.ZipExtractToFile(fileName, toPath, _config.GuiItem.IgnoreGeoUpdateCore ? "geo" : "");
+                    FileManager.ZipExtractToFile(fileName, toPath, "geo");
                 }
 
                 if (Utils.IsNonWindows())

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -48,7 +48,7 @@ namespace ServiceLib.ViewModels
                 await ClashConnectionClose(true);
             });
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
@@ -73,6 +73,7 @@ namespace ServiceLib.ViewModels
                       Task.Delay(1000).Wait();
                   }
               });
+            await Task.CompletedTask;
         }
 
         private async Task GetClashConnections()

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -90,13 +90,13 @@ namespace ServiceLib.ViewModels
             y => y == true)
                 .Subscribe(c => { _config.ClashUIItem.ProxiesAutoRefresh = AutoRefresh; });
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
         {
             await ProxiesReload();
-            DelayTestTask();
+            _ = DelayTestTask();
         }
 
         private async Task DoRulemodeSelected(bool c)
@@ -265,7 +265,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            _proxies.TryGetValue(name, out ProxiesItem proxy);
+            _proxies.TryGetValue(name, out var proxy);
             if (proxy == null || proxy.all == null)
             {
                 return;
@@ -316,7 +316,7 @@ namespace ServiceLib.ViewModels
         {
             if (_proxies is null)
                 return null;
-            _proxies.TryGetValue(name, out ProxiesItem proxy2);
+            _proxies.TryGetValue(name, out var proxy2);
             if (proxy2 != null)
             {
                 return proxy2;
@@ -399,6 +399,7 @@ namespace ServiceLib.ViewModels
 
                 _updateView?.Invoke(EViewAction.DispatcherProxiesDelayTest, new SpeedTestResult() { IndexId = item.Name, Delay = result });
             });
+            await Task.CompletedTask;
         }
 
         public void ProxiesDelayTestResult(SpeedTestResult result)
@@ -434,7 +435,7 @@ namespace ServiceLib.ViewModels
         public async Task DelayTestTask()
         {
             var lastTime = DateTime.Now;
-            Task.Run(async () =>
+            _ = Task.Run(async () =>
             {
                 while (true)
                 {
@@ -457,6 +458,7 @@ namespace ServiceLib.ViewModels
                     lastTime = dtNow;
                 }
             });
+            await Task.CompletedTask;
         }
 
         #endregion task

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -32,15 +32,17 @@ namespace ServiceLib.ViewModels
             ImportDefConfig4V2rayCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
+                await Task.CompletedTask;
             });
 
             ImportDefConfig4SingboxCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 normalDNS2 = Utils.GetEmbedText(Global.DNSSingboxNormalFileName);
                 tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
+                await Task.CompletedTask;
             });
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -63,6 +63,8 @@ namespace ServiceLib.ViewModels
 
         #endregion Menu
 
+        private bool _hasNextReloadJob = false;
+
         #region Init
 
         public MainWindowViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
@@ -204,7 +206,7 @@ namespace ServiceLib.ViewModels
 
             #endregion WhenAnyValue && ReactiveCommand
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
@@ -217,11 +219,12 @@ namespace ServiceLib.ViewModels
             await CoreHandler.Instance.Init(_config, UpdateHandler);
             TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);
 
-            if (_config.GuiItem.EnableStatistics)
+            if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)
             {
                 await StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);
             }
 
+            BlReloadEnabled = true;
             await Reload();
             await AutoHideStartup();
             Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
@@ -249,7 +252,7 @@ namespace ServiceLib.ViewModels
                 RefreshServers();
                 if (indexIdOld != _config.IndexId)
                 {
-                    Reload();
+                    _ = Reload();
                 }
                 if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
                 {
@@ -269,16 +272,13 @@ namespace ServiceLib.ViewModels
 
         public void SetStatisticsResult(ServerSpeedItem update)
         {
-            try
+            if (_config.GuiItem.DisplayRealTimeSpeed)
             {
                 Locator.Current.GetService<StatusBarViewModel>()?.UpdateStatistics(update);
-                if ((update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 9 == 0)
-                {
-                    Locator.Current.GetService<ProfilesViewModel>()?.UpdateStatistics(update);
-                }
             }
-            catch
+            if (_config.GuiItem.EnableStatistics && (update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 9 == 0)
             {
+                Locator.Current.GetService<ProfilesViewModel>()?.UpdateStatistics(update);
             }
         }
 
@@ -403,6 +403,7 @@ namespace ServiceLib.ViewModels
         public async Task AddServerViaScanAsync()
         {
             _updateView?.Invoke(EViewAction.ScanScreenTask, null);
+            await Task.CompletedTask;
         }
 
         public async Task ScanScreenResult(byte[]? bytes)
@@ -414,6 +415,7 @@ namespace ServiceLib.ViewModels
         public async Task AddServerViaImageAsync()
         {
             _updateView?.Invoke(EViewAction.ScanImageTask, null);
+            await Task.CompletedTask;
         }
 
         public async Task ScanImageResult(string fileName)
@@ -527,6 +529,7 @@ namespace ServiceLib.ViewModels
             {
                 ProcUtils.ProcessStart("open", path);
             }
+            await Task.CompletedTask;
         }
 
         #endregion Setting
@@ -535,19 +538,33 @@ namespace ServiceLib.ViewModels
 
         public async Task Reload()
         {
+            //If there are unfinished reload job, marked with next job.
+            if (!BlReloadEnabled)
+            {
+                _hasNextReloadJob = true;
+                return;
+            }
+
             BlReloadEnabled = false;
 
             await LoadCore();
-            Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
             await SysProxyHandler.UpdateSysProxy(_config, false);
+            Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 
             _updateView?.Invoke(EViewAction.DispatcherReload, null);
+
+            BlReloadEnabled = true;
+            if (_hasNextReloadJob)
+            {
+                _hasNextReloadJob = false;
+                await Reload();
+            }
         }
 
         public void ReloadResult()
         {
+            // BlReloadEnabled = true;
             //Locator.Current.GetService<StatusBarViewModel>()?.ChangeSystemProxyAsync(_config.systemProxyItem.sysProxyType, false);
-            BlReloadEnabled = true;
             ShowClashUI = _config.IsRunningCore(ECoreType.sing_box);
             if (ShowClashUI)
             {
@@ -558,16 +575,8 @@ namespace ServiceLib.ViewModels
 
         private async Task LoadCore()
         {
-            //if (_config.tunModeItem.enableTun)
-            //{
-            //    Task.Delay(1000).Wait();
-            //    WindowsUtils.RemoveTunDevice();
-            //}
-            await Task.Run(async () =>
-            {
-                var node = await ConfigHandler.GetDefaultServer(_config);
-                await CoreHandler.Instance.LoadCore(node);
-            });
+            var node = await ConfigHandler.GetDefaultServer(_config);
+            await CoreHandler.Instance.LoadCore(node);
         }
 
         public async Task CloseCore()
@@ -582,6 +591,7 @@ namespace ServiceLib.ViewModels
             {
                 ShowHideWindow(false);
             }
+            await Task.CompletedTask;
         }
 
         #endregion core job

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -105,6 +105,7 @@ namespace ServiceLib.ViewModels
             {
                 _queueMsg.Enqueue(Environment.NewLine);
             }
+            await Task.CompletedTask;
         }
 
         public void ClearMsg()

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -49,7 +49,7 @@ namespace ServiceLib.ViewModels
         [Reactive] public bool AutoRun { get; set; }
         [Reactive] public bool EnableStatistics { get; set; }
         [Reactive] public bool KeepOlderDedupl { get; set; }
-        [Reactive] public bool IgnoreGeoUpdateCore { get; set; }
+        [Reactive] public bool DisplayRealTimeSpeed { get; set; }
         [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
         [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
@@ -115,7 +115,7 @@ namespace ServiceLib.ViewModels
                 await SaveSettingAsync();
             });
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
@@ -164,8 +164,8 @@ namespace ServiceLib.ViewModels
 
             AutoRun = _config.GuiItem.AutoRun;
             EnableStatistics = _config.GuiItem.EnableStatistics;
+            DisplayRealTimeSpeed = _config.GuiItem.DisplayRealTimeSpeed;
             KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
-            IgnoreGeoUpdateCore = _config.GuiItem.IgnoreGeoUpdateCore;
             EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
             EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
             EnableSecurityProtocolTls13 = _config.GuiItem.EnableSecurityProtocolTls13;
@@ -261,6 +261,7 @@ namespace ServiceLib.ViewModels
                         break;
                 }
             });
+            await Task.CompletedTask;
         }
 
         private async Task SaveSettingAsync()
@@ -272,6 +273,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
             var needReboot = (EnableStatistics != _config.GuiItem.EnableStatistics
+                              || DisplayRealTimeSpeed != _config.GuiItem.DisplayRealTimeSpeed
                             || EnableDragDropSort != _config.UiItem.EnableDragDropSort
                             || EnableHWA != _config.GuiItem.EnableHWA
                             || CurrentFontFamily != _config.UiItem.CurrentFontFamily
@@ -317,8 +319,8 @@ namespace ServiceLib.ViewModels
 
             _config.GuiItem.AutoRun = AutoRun;
             _config.GuiItem.EnableStatistics = EnableStatistics;
+            _config.GuiItem.DisplayRealTimeSpeed = DisplayRealTimeSpeed;
             _config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
-            _config.GuiItem.IgnoreGeoUpdateCore = IgnoreGeoUpdateCore;
             _config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
             _config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
             _config.GuiItem.EnableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
@@ -410,6 +412,7 @@ namespace ServiceLib.ViewModels
                 }
                 item.CoreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);
             }
+            await Task.CompletedTask;
         }
     }
 }

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -231,7 +231,7 @@ namespace ServiceLib.ViewModels
                 MessageBus.Current.Listen<string>(EMsgCommand.RefreshProfiles.ToString()).Subscribe(OnNext);
             }
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
@@ -360,7 +360,7 @@ namespace ServiceLib.ViewModels
 
         public async Task RefreshServersBiz()
         {
-            var lstModel = await AppHandler.Instance.ProfileItemsEx(_config.SubIndexId, _serverFilter);
+            var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
             _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
 
             _profileItems.Clear();
@@ -399,6 +399,45 @@ namespace ServiceLib.ViewModels
             }
         }
 
+        private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
+        {
+            var lstModel = await AppHandler.Instance.ProfileItems(_config.SubIndexId, filter);
+
+            await ConfigHandler.SetDefaultServer(_config, lstModel);
+
+            var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
+            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
+            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;
+        }
+
         #endregion Servers && Groups
 
         #region Add Servers

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -257,7 +257,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            string result = Utils.LoadResource(fileName);
+            var result = Utils.LoadResource(fileName);
             if (Utils.IsNullOrEmpty(result))
             {
                 return;

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -67,7 +67,7 @@ namespace ServiceLib.ViewModels
                 await SaveRoutingAsync();
             });
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -137,6 +137,7 @@ namespace ServiceLib.ViewModels
             NotifyLeftClickCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 Locator.Current.GetService<MainWindowViewModel>()?.ShowHideWindow(null);
+                await Task.CompletedTask;
             });
 
             AddServerViaClipboardCmd = ReactiveCommand.CreateFromTask(async () =>
@@ -180,7 +181,7 @@ namespace ServiceLib.ViewModels
             {
                 InitUpdateView(updateView);
             }
-            Init();
+            _ = Init();
         }
 
         private async Task Init()
@@ -423,10 +424,12 @@ namespace ServiceLib.ViewModels
                         Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
                         return;
                     }
-                    //else if (Utils.IsLinux())
-                    //{
-                    //    NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
-                    //}
+                    else if (Utils.IsOSX())
+                    {
+                        _config.TunModeItem.EnableTun = false;
+                        NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
+                        return;
+                    }
                 }
                 await ConfigHandler.SaveConfig(_config);
                 Locator.Current.GetService<MainWindowViewModel>()?.Reload();
@@ -476,12 +479,19 @@ namespace ServiceLib.ViewModels
             {
                 InboundLanDisplay = $"{ResUI.LabLAN}:{Global.None}";
             }
+            await Task.CompletedTask;
         }
 
         public void UpdateStatistics(ServerSpeedItem update)
         {
-            SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
-            SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
+            try
+            {
+                SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
+                SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
+            }
+            catch
+            {
+            }
         }
 
         #endregion UI

v2rayN/ServiceLib/ViewModels/SubSettingViewModel.cs

@@ -48,7 +48,7 @@ namespace ServiceLib.ViewModels
                 await _updateView?.Invoke(EViewAction.ShareSub, SelectedSource?.Url);
             }, canEditRemove);
 
-            Init();
+            _ = Init();
         }
 
         private async Task Init()

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -385,9 +385,9 @@
                             Grid.Column="0"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
+                            Text="{x:Static resx:ResUI.TbSettingsDisplayRealTimeSpeed}" />
                         <ToggleSwitch
-                            x:Name="togKeepOlderDedupl"
+                            x:Name="togDisplayRealTimeSpeed"
                             Grid.Row="3"
                             Grid.Column="1"
                             HorizontalAlignment="Left"
@@ -398,9 +398,9 @@
                             Grid.Column="0"
                             VerticalAlignment="Center"
                             Classes="Margin8"
-                            Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
+                            Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
                         <ToggleSwitch
-                            x:Name="togIgnoreGeoUpdateCore"
+                            x:Name="togKeepOlderDedupl"
                             Grid.Row="4"
                             Grid.Column="1"
                             HorizontalAlignment="Left"

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

@@ -126,8 +126,8 @@ namespace v2rayN.Desktop.Views
 
                 this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableSecurityProtocolTls13, v => v.togEnableSecurityProtocolTls13.IsChecked).DisposeWith(disposables);

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -601,9 +601,9 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
+                            Text="{x:Static resx:ResUI.TbSettingsDisplayRealTimeSpeed}" />
                         <ToggleButton
-                            x:Name="togKeepOlderDedupl"
+                            x:Name="togDisplayRealTimeSpeed"
                             Grid.Row="3"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
@@ -615,9 +615,9 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsIgnoreGeoUpdateCore}" />
+                            Text="{x:Static resx:ResUI.TbSettingsKeepOlderDedupl}" />
                         <ToggleButton
-                            x:Name="togIgnoreGeoUpdateCore"
+                            x:Name="togKeepOlderDedupl"
                             Grid.Row="4"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -136,8 +136,8 @@ namespace v2rayN.Views
 
                 this.Bind(ViewModel, vm => vm.AutoRun, v => v.togAutoRun.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableStatistics, v => v.togEnableStatistics.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.IgnoreGeoUpdateCore, v => v.togIgnoreGeoUpdateCore.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.EnableSecurityProtocolTls13, v => v.togEnableSecurityProtocolTls13.IsChecked).DisposeWith(disposables);
@@ -248,7 +248,9 @@ namespace v2rayN.Views
             {
                 Logging.SaveLog("GetFonts", ex);
             }
-            return lstFonts.OrderBy(t => t).ToList();
+
+            var lst = lstFonts.OrderBy(t => t).ToList();
+            return await Task.FromResult(lst);
         }
 
         private void ClbdestOverride_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)