Improve reload function

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -80,6 +80,7 @@
             Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
             Logging.LoggingEnabled(_config.GuiItem.EnableLog);
             Logging.ClearLogs();
+            ClearTemps();
 
             return true;
         }
@@ -91,6 +92,36 @@
             return true;
         }
 
+        private void ClearTemps()
+        {
+            Task.Run(() =>
+            {
+                try
+                {
+                    var now = DateTime.Now.AddMonths(-1);
+                    var dir = Utils.GetTempPath();
+                    var files = Directory.GetFiles(dir, "*.*");
+                    foreach (var filePath in files)
+                    {
+                        var file = new FileInfo(filePath);
+                        if (file.CreationTime >= now) continue;
+                        try
+                        {
+                            file.Delete();
+                        }
+                        catch
+                        {
+                            // ignored
+                        }
+                    }
+                }
+                catch
+                {
+                    // ignored
+                }
+            });
+        }
+
         #endregion Init
 
         #region Config
@@ -170,45 +201,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/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/ViewModels/MainWindowViewModel.cs

@@ -222,6 +222,7 @@ namespace ServiceLib.ViewModels
                 await StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);
             }
 
+            BlReloadEnabled = true;
             await Reload();
             await AutoHideStartup();
             Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
@@ -533,8 +534,17 @@ namespace ServiceLib.ViewModels
 
         #region core job
 
-        public async Task Reload()
+        public async Task Reload(int times = 0)
         {
+            //If there are unfinished reload job, wait a few seconds and exec again.
+            if (!BlReloadEnabled)
+            {
+                await Task.Delay(3000);
+                if (times > 3) return;
+                await Reload(++times);
+                return;
+            }
+
             BlReloadEnabled = false;
 
             await LoadCore();
@@ -558,16 +568,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()

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -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