bug fixes

5amN1 · Apr 13, 2023 · d1a2ad6 · d1a2ad6
1 parent e41dc25
commit d1a2ad6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/clashN/clashN/Handler/CoreHandler.cs b/clashN/clashN/Handler/CoreHandler.cs
@@ -78,6 +78,7 @@ public void LoadCore(Config config)
         private void CoreRestart(ProfileItem item)
         {
             CoreStop();
+            Thread.Sleep(1000);
             CoreStart(item);
         }
 

diff --git a/clashN/clashN/Handler/MainFormHandler.cs b/clashN/clashN/Handler/MainFormHandler.cs
@@ -205,11 +205,11 @@ private async Task GetClashProxiesAsync(Config config, Action<ClashProxies, Clas
         {
             for (var i = 0; i < 5; i++)
             {
-                var url = $"{Global.httpProtocol}{Global.Loopback}:{config.ApiPort}/proxies";
+                var url = $"{GetApiUrl()}/proxies";
                 var result = await HttpClientHelper.GetInstance().TryGetAsync(url);
                 var clashProxies = Utils.FromJson<ClashProxies>(result);
 
-                var url2 = $"{Global.httpProtocol}{Global.Loopback}:{config.ApiPort}/providers/proxies";
+                var url2 = $"{GetApiUrl()}/providers/proxies";
                 var result2 = await HttpClientHelper.GetInstance().TryGetAsync(url2);
                 var clashProviders = Utils.FromJson<ClashProviders>(result2);
 
@@ -261,7 +261,7 @@ public void ClashProxiesDelayTest(bool blAll, List<ProxyModel> lstProxy, Action<
                 {
                     return;
                 }
-                var urlBase = $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}/proxies";
+                var urlBase = $"{GetApiUrl()}/proxies";
                 urlBase += @"/{0}/delay?timeout=10000&url=" + LazyConfig.Instance.Config.ConstItem.speedPingTestUrl;
 
                 List<Task> tasks = new List<Task>();
@@ -320,7 +320,7 @@ public async void ClashSetActiveProxy(string name, string nameNode)
         {
             try
             {
-                var url = $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}/proxies/{name}";
+                var url = $"{GetApiUrl()}/proxies/";
                 Dictionary<string, string> headers = new Dictionary<string, string>();
                 headers.Add("name", nameNode);
                 await HttpClientHelper.GetInstance().PutAsync(url, headers);
@@ -341,7 +341,7 @@ public void ClashConfigUpdate(Dictionary<string, string> headers)
                     return;
                 }
 
-                var urlBase = $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}/configs";
+                var urlBase = $"{GetApiUrl()}/configs";
 
                 await HttpClientHelper.GetInstance().PatchAsync(urlBase, headers);
             });
@@ -352,7 +352,7 @@ public async void ClashConfigReload(string filePath)
             ClashConnectionClose("");
             try
             {
-                var url = $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}/configs?force=true";
+                var url = $"{GetApiUrl()}/configs?force=true";
                 Dictionary<string, string> headers = new Dictionary<string, string>();
                 headers.Add("path", filePath);
                 await HttpClientHelper.GetInstance().PutAsync(url, headers);
@@ -371,7 +371,7 @@ private async Task GetClashConnectionsAsync(Config config, Action<ClashConnectio
         {
             try
             {
-                var url = $"{Global.httpProtocol}{Global.Loopback}:{config.ApiPort}/connections";
+                var url = $"{GetApiUrl()}/connections";
                 var result = await HttpClientHelper.GetInstance().TryGetAsync(url);
                 var clashConnections = Utils.FromJson<ClashConnections>(result);
 
@@ -387,13 +387,18 @@ public async void ClashConnectionClose(string id)
         {
             try
             {
-                var url = $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}/connections/{id}";
+                var url = $"{GetApiUrl()}/connections/";
                 await HttpClientHelper.GetInstance().DeleteAsync(url);
             }
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
             }
         }
+
+        private string GetApiUrl()
+        {
+            return $"{Global.httpProtocol}{Global.Loopback}:{LazyConfig.Instance.Config.ApiPort}";
+        }
     }
 }