Rename Manager

v2rayN/ServiceLib/Manager/AppManager.cs

@@ -1,15 +1,15 @@
 namespace ServiceLib.Manager;
 
-public sealed class AppHandler
+public sealed class AppManager
 {
     #region Property
 
-    private static readonly Lazy<AppHandler> _instance = new(() => new());
+    private static readonly Lazy<AppManager> _instance = new(() => new());
     private Config _config;
     private int? _statePort;
     private int? _statePort2;
     private Job? _processJob;
-    public static AppHandler Instance => _instance.Value;
+    public static AppManager Instance => _instance.Value;
     public Config Config => _config;
 
     public int StatePort

v2rayN/ServiceLib/Manager/ClashApiManager.cs

@@ -2,10 +2,10 @@ using static ServiceLib.Models.ClashProxies;
 
 namespace ServiceLib.Manager;
 
-public sealed class ClashApiHandler
+public sealed class ClashApiManager
 {
-    private static readonly Lazy<ClashApiHandler> instance = new(() => new());
-    public static ClashApiHandler Instance => instance.Value;
+    private static readonly Lazy<ClashApiManager> instance = new(() => new());
+    public static ClashApiManager Instance => instance.Value;
 
     private static readonly string _tag = "ClashApiHandler";
     private Dictionary<string, ProxiesItem>? _proxies;
@@ -65,7 +65,7 @@ public sealed class ClashApiHandler
                 return;
             }
             var urlBase = $"{GetApiUrl()}/proxies";
-            urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
+            urlBase += @"/{0}/delay?timeout=10000&url=" + AppManager.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
 
             var tasks = new List<Task>();
             foreach (var it in lstProxy)
@@ -182,6 +182,6 @@ public sealed class ClashApiHandler
 
     private string GetApiUrl()
     {
-        return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
+        return $"{Global.HttpProtocol}{Global.Loopback}:{AppManager.Instance.StatePort2}";
     }
 }

v2rayN/ServiceLib/Manager/CoreAdminManager.cs

@@ -5,10 +5,10 @@ using CliWrap.Buffered;
 
 namespace ServiceLib.Manager;
 
-public class CoreAdminHandler
+public class CoreAdminManager
 {
-    private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
-    public static CoreAdminHandler Instance => _instance.Value;
+    private static readonly Lazy<CoreAdminManager> _instance = new(() => new());
+    public static CoreAdminManager Instance => _instance.Value;
     private Config _config;
     private Action<bool, string>? _updateFunc;
     private int _linuxSudoPid = -1;
@@ -72,7 +72,7 @@ public class CoreAdminHandler
         proc.BeginErrorReadLine();
 
         await Task.Delay(10);
-        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
+        await proc.StandardInput.WriteLineAsync(AppManager.Instance.LinuxSudoPwd);
 
         await Task.Delay(100);
         if (proc is null or { HasExited: true })
@@ -103,7 +103,7 @@ public class CoreAdminHandler
             var arg = new List<string>() { "-c", $"sudo -S {shFilePath} {_linuxSudoPid}" };
             var result = await Cli.Wrap(Global.LinuxBash)
                 .WithArguments(arg)
-                .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+                .WithStandardInputPipe(PipeSource.FromString(AppManager.Instance.LinuxSudoPwd))
                 .ExecuteBufferedAsync();
 
             UpdateFunc(false, result.StandardOutput.ToString());

v2rayN/ServiceLib/Manager/CoreInfoManager.cs

@@ -1,12 +1,12 @@
 namespace ServiceLib.Manager;
 
-public sealed class CoreInfoHandler
+public sealed class CoreInfoManager
 {
-    private static readonly Lazy<CoreInfoHandler> _instance = new(() => new());
+    private static readonly Lazy<CoreInfoManager> _instance = new(() => new());
     private List<CoreInfo>? _coreInfo;
-    public static CoreInfoHandler Instance => _instance.Value;
+    public static CoreInfoManager Instance => _instance.Value;
 
-    public CoreInfoHandler()
+    public CoreInfoManager()
     {
         InitCoreInfo();
     }

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -6,10 +6,10 @@ namespace ServiceLib.Manager;
 /// <summary>
 /// Core process processing class
 /// </summary>
-public class CoreHandler
+public class CoreManager
 {
-    private static readonly Lazy<CoreHandler> _instance = new(() => new());
-    public static CoreHandler Instance => _instance.Value;
+    private static readonly Lazy<CoreManager> _instance = new(() => new());
+    public static CoreManager Instance => _instance.Value;
     private Config _config;
     private Process? _process;
     private Process? _processPre;
@@ -39,7 +39,7 @@ public class CoreHandler
 
         if (Utils.IsNonWindows())
         {
-            var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+            var coreInfo = CoreInfoManager.Instance.GetCoreInfo();
             foreach (var it in coreInfo)
             {
                 if (it.CoreType == ECoreType.v2rayN)
@@ -114,7 +114,7 @@ public class CoreHandler
         UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
         UpdateFunc(false, configPath);
 
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
         if (proc is null)
         {
@@ -126,7 +126,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(ServerTestItem testItem)
     {
-        var node = await AppHandler.Instance.GetProfileItem(testItem.IndexId);
+        var node = await AppManager.Instance.GetProfileItem(testItem.IndexId);
         if (node is null)
         {
             return -1;
@@ -140,8 +140,8 @@ public class CoreHandler
             return -1;
         }
 
-        var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
         var proc = await RunProcess(coreInfo, fileName, true, false);
         if (proc is null)
         {
@@ -157,7 +157,7 @@ public class CoreHandler
         {
             if (_linuxSudo)
             {
-                await CoreAdminHandler.Instance.KillProcessAsLinuxSudo();
+                await CoreAdminManager.Instance.KillProcessAsLinuxSudo();
                 _linuxSudo = false;
             }
 
@@ -183,8 +183,8 @@ public class CoreHandler
 
     private async Task CoreStart(ProfileItem node)
     {
-        var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var coreType = _config.RunningCoreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoManager.Instance.GetCoreInfo(coreType);
 
         var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
         var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
@@ -199,7 +199,7 @@ public class CoreHandler
     {
         if (_process != null && !_process.HasExited)
         {
-            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+            var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
             var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
             if (itemSocks != null)
             {
@@ -208,7 +208,7 @@ public class CoreHandler
                 var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
                 if (result.Success)
                 {
-                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                    var coreInfo = CoreInfoManager.Instance.GetCoreInfo(preCoreType);
                     var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
                     if (proc is null)
                     {
@@ -231,7 +231,7 @@ public class CoreHandler
 
     private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
     {
-        var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
+        var fileName = CoreInfoManager.Instance.GetCoreExecFile(coreInfo, out var msg);
         if (fileName.IsNullOrEmpty())
         {
             UpdateFunc(false, msg);
@@ -246,8 +246,8 @@ public class CoreHandler
                 && Utils.IsNonWindows())
             {
                 _linuxSudo = true;
-                await CoreAdminHandler.Instance.Init(_config, _updateFunc);
-                return await CoreAdminHandler.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
+                await CoreAdminManager.Instance.Init(_config, _updateFunc);
+                return await CoreAdminManager.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
             }
 
             return await RunProcessNormal(fileName, coreInfo, configPath, displayLog);
@@ -299,7 +299,7 @@ public class CoreHandler
         }
 
         await Task.Delay(100);
-        AppHandler.Instance.AddProcess(proc.Handle);
+        AppManager.Instance.AddProcess(proc.Handle);
         if (proc is null or { HasExited: true })
         {
             throw new Exception(ResUI.FailedToRunCore);

v2rayN/ServiceLib/Manager/NoticeManager.cs

@@ -2,10 +2,10 @@ using ReactiveUI;
 
 namespace ServiceLib.Manager;
 
-public class NoticeHandler
+public class NoticeManager
 {
-    private static readonly Lazy<NoticeHandler> _instance = new(() => new());
-    public static NoticeHandler Instance => _instance.Value;
+    private static readonly Lazy<NoticeManager> _instance = new(() => new());
+    public static NoticeManager Instance => _instance.Value;
 
     public void Enqueue(string? content)
     {

v2rayN/ServiceLib/Manager/PacManager.cs

@@ -3,10 +3,10 @@ using System.Text;
 
 namespace ServiceLib.Manager;
 
-public class PacHandler
+public class PacManager
 {
-    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
-    public static PacHandler Instance => _instance.Value;
+    private static readonly Lazy<PacManager> _instance = new(() => new PacManager());
+    public static PacManager Instance => _instance.Value;
 
     private string _configPath;
     private int _httpPort;

v2rayN/ServiceLib/Manager/ProfileExManager.cs

@@ -2,17 +2,17 @@ using System.Collections.Concurrent;
 
 //using System.Reactive.Linq;
 
-namespace ServiceLib.Handler;
+namespace ServiceLib.Manager;
 
-public class ProfileExHandler
+public class ProfileExManager
 {
-    private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
+    private static readonly Lazy<ProfileExManager> _instance = new(() => new());
     private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
     private readonly Queue<string> _queIndexIds = new();
-    public static ProfileExHandler Instance => _instance.Value;
+    public static ProfileExManager Instance => _instance.Value;
     private static readonly string _tag = "ProfileExHandler";
 
-    public ProfileExHandler()
+    public ProfileExManager()
     {
         //Init();
     }

v2rayN/ServiceLib/Manager/StatisticsManager.cs

@@ -1,9 +1,9 @@
 namespace ServiceLib.Manager;
 
-public class StatisticsHandler
+public class StatisticsManager
 {
-    private static readonly Lazy<StatisticsHandler> instance = new(() => new());
-    public static StatisticsHandler Instance => instance.Value;
+    private static readonly Lazy<StatisticsManager> instance = new(() => new());
+    public static StatisticsManager Instance => instance.Value;
 
     private Config _config;
     private ServerStatItem? _serverStatItem;

v2rayN/ServiceLib/Manager/TaskManager.cs

@@ -1,9 +1,9 @@
 namespace ServiceLib.Manager;
 
-public class TaskHandler
+public class TaskManager
 {
-    private static readonly Lazy<TaskHandler> _instance = new(() => new());
-    public static TaskHandler Instance => _instance.Value;
+    private static readonly Lazy<TaskManager> _instance = new(() => new());
+    public static TaskManager Instance => _instance.Value;
 
     public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
     {
@@ -29,7 +29,7 @@ public class TaskHandler
                 //Logging.SaveLog("Execute save config");
 
                 await ConfigHandler.SaveConfig(config);
-                await ProfileExHandler.Instance.SaveTo();
+                await ProfileExManager.Instance.SaveTo();
             }
 
             //Execute once 1 hour
@@ -52,7 +52,7 @@ public class TaskHandler
     private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
     {
         var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-        var lstSubs = (await AppHandler.Instance.SubItems())?
+        var lstSubs = (await AppManager.Instance.SubItems())?
             .Where(t => t.AutoUpdateInterval > 0)
             .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
             .ToList();

v2rayN/ServiceLib/Manager/WebDavManager.cs

@@ -3,10 +3,10 @@ using WebDav;
 
 namespace ServiceLib.Manager;
 
-public sealed class WebDavHandler
+public sealed class WebDavManager
 {
-    private static readonly Lazy<WebDavHandler> _instance = new(() => new());
-    public static WebDavHandler Instance => _instance.Value;
+    private static readonly Lazy<WebDavManager> _instance = new(() => new());
+    public static WebDavManager Instance => _instance.Value;
 
     private readonly Config? _config;
     private WebDavClient? _client;
@@ -15,9 +15,9 @@ public sealed class WebDavHandler
     private readonly string _webFileName = "backup.zip";
     private readonly string _tag = "WebDav--";
 
-    public WebDavHandler()
+    public WebDavManager()
     {
-        _config = AppHandler.Instance.Config;
+        _config = AppManager.Instance.Config;
     }
 
     private async Task<bool> GetClient()