fix: 修复了保活和检测被踢逻辑

SaltWood-Studio · May 26, 2024 · 44ddf03 · 44ddf03
1 parent a1f8489
commit 44ddf03
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/CSharp-OpenBMCLAPI/Modules/Cluster.cs b/CSharp-OpenBMCLAPI/Modules/Cluster.cs
@@ -3,7 +3,6 @@
 using CSharpOpenBMCLAPI.Modules.WebServer;
 using Konsole;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using SocketIOClient;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -392,12 +391,12 @@ private void _keepAliveMessageParser(SocketIOResponse resp)
         {
             try
             {
-                var returns = resp.GetValue<List<object?>>(0);
-                string? message = returns.First() as string;
-                bool? enabled = returns.Last() as bool?;
-                if (message == null)
+                var returns = resp.GetValue<List<JsonElement>>(0);
+                string? message = returns.First().GetString();
+                bool enabled = !(returns.Last().ValueKind == JsonValueKind.False);
+                if (enabled)
                 {
-                    string? time = returns.Last() as string;
+                    string? time = returns.Last().GetString();
                     Logger.Instance.LogSystem($"保活成功 at {time}，served {Utils.GetLength(this.counter.bytes)}({this.counter.bytes} bytes)/{this.counter.hits} hits");
                 }
                 else
@@ -406,8 +405,11 @@ private void _keepAliveMessageParser(SocketIOResponse resp)
                     if (this.WantEnable)
                     {
                         Logger.Instance.LogError($"保活失败：{returns}，将在 10 分钟后重新上线");
-                        Thread.Sleep(10 * 60 * 1000);
-                        this.Enable().Wait();
+                        Task.Run(() =>
+                        {
+                            Thread.Sleep(10 * 60 * 1000);
+                            this.Enable().Wait();
+                        });
                     }
                 }
             }