[Pull Request] Refactored network related parts.

Helper.cs

@@ -105,10 +105,10 @@ public static void StartUpCheck()
 
         Program.TasksManager.SignalRun(nameof(SignalsNames.MainWindowInitSignal), () =>
         {
-            new Thread(() =>
+            new Thread(async () =>
             {
                 Thread.Sleep(Program.Config.Web.DelayStartSeconds * 1000);
-                Program.WebManager = new WebManager().Start();
+                Program.WebManager = await new WebManager().Start();
             }).Start();
         });
 

Interfaces/IModuleController.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace KitX_Dashboard.Interfaces;
+
+internal interface IModuleController<T> : IDisposable
+{
+    Task<T> Start();
+
+    Task<T> Stop();
+
+    Task<T> Restart();
+}

Interfaces/Network/IKitXClient.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Threading.Tasks;
+
+namespace KitX_Dashboard.Interfaces.Network;
+
+internal interface IKitXClient<T> : IModuleController<T>
+{
+    Task<T> Connect();
+
+    Task<T> Disconnect();
+
+    Task<T> Send(byte[] content);
+
+    T OnReceive(Action<byte[], int?> action);
+}

Interfaces/Network/IKitXServer.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+
+namespace KitX_Dashboard.Interfaces.Network;
+
+internal interface IKitXServer<T> : IModuleController<T>
+{
+    Task<T> Broadcast(byte[] content);
+
+    Task<T> BroadCast(byte[] content, Func<TcpClient, bool>? pattern);
+
+    Task<T> Send(byte[] content, string target);
+
+    T OnReceive(Action<byte[], int?, string> action);
+}

Managers/DevicesManager.cs

@@ -1,7 +1,7 @@
 using Avalonia.Threading;
 using KitX.Web.Rules;
 using KitX_Dashboard.Data;
-using KitX_Dashboard.Servers;
+using KitX_Dashboard.Network;
 using KitX_Dashboard.Services;
 using KitX_Dashboard.Views.Pages.Controls;
 using Serilog;
@@ -16,19 +16,23 @@ internal class DevicesManager
 {
     internal static void InitEvents()
     {
-        EventService.OnReceivingDeviceInfoStruct4DeviceNet += dis =>
+        EventService.OnReceivingDeviceInfoStruct += dis =>
         {
-            if (GlobalInfo.IsMainMachine)
-                if (dis.DeviceServerBuildTime < GlobalInfo.ServerBuildTime)
-                {
-                    Program.WebManager?.devicesServer?.CancleBuildServer();
-                    Log.Information($"In DevicesManager: Watched for earlier built server. " +
-                        $"DeviceServerAddress: {dis.IPv4}:{dis.DeviceServerPort} " +
-                        $"DeviceServerBuildTime: {dis.DeviceServerBuildTime}");
-                }
+            if (dis.IsMainDevice && dis.DeviceServerBuildTime < GlobalInfo.ServerBuildTime)
+            {
+                Program.WebManager?.devicesServer?.Stop();
+
+                Watch4MainDevice();
+
+                Log.Information($"In DevicesManager: Watched earlier built server. " +
+                    $"DeviceServerAddress: {dis.IPv4}:{dis.DeviceServerPort} " +
+                    $"DeviceServerBuildTime: {dis.DeviceServerBuildTime}");
+            }
         };
     }
 
+    private static readonly object _receivedDeviceInfoStruct4WatchLock = new();
+
     internal static List<DeviceInfoStruct>? receivedDeviceInfoStruct4Watch;
 
     internal static readonly Queue<DeviceInfoStruct> deviceInfoStructs = new();
@@ -53,7 +57,7 @@ private static bool CheckDeviceIsOffline(DeviceInfoStruct info)
     /// <returns>是否是本机卡片</returns>
     private static bool CheckIsCurrentMachine(DeviceInfoStruct info)
     {
-        var self = DevicesServer.DefaultDeviceInfoStruct;
+        var self = DevicesDiscoveryServer.DefaultDeviceInfoStruct;
         return info.DeviceMacAddress.Equals(self.DeviceMacAddress)
             && info.DeviceName.Equals(self.DeviceName);
     }
@@ -266,98 +270,111 @@ internal static void KeepCheckAndRemove()
     internal static void Update(DeviceInfoStruct deviceInfo)
     {
         deviceInfoStructs.Enqueue(deviceInfo);
-        receivedDeviceInfoStruct4Watch?.Add(deviceInfo);
 
-        if (deviceInfo.IsMainDevice)
-            EventService.Invoke(nameof(EventService.OnReceivingDeviceInfoStruct4DeviceNet),
-                deviceInfo);
+        if (receivedDeviceInfoStruct4Watch is not null)
+        {
+            lock (_receivedDeviceInfoStruct4WatchLock)
+            {
+                receivedDeviceInfoStruct4Watch.Add(deviceInfo);
+            }
+        }
+
+        EventService.Invoke(nameof(EventService.OnReceivingDeviceInfoStruct), deviceInfo);
     }
 
     /// <summary>
     /// 观察主控
     /// </summary>
     internal static void Watch4MainDevice()
     {
+        var location = $"{nameof(DevicesManager)}.{nameof(Watch4MainDevice)}";
+
         new Thread(() =>
         {
-            try
-            {
-                receivedDeviceInfoStruct4Watch = new();
+            receivedDeviceInfoStruct4Watch = new();
 
-                var checkedTime = 0;
-                var hadMainDevice = false;
-                var earliestBuiltServerTime = DateTime.UtcNow;
-                var serverPort = 0;
-                var serverAddress = string.Empty;
+            var checkedTime = 0;
+            var hadMainDevice = false;
+            var earliestBuiltServerTime = DateTime.UtcNow;
+            var serverPort = 0;
+            var serverAddress = string.Empty;
 
-                while (checkedTime < 7)
+            while (checkedTime < 7)
+            {
+                try
                 {
-                    try
-                    {
-                        if (receivedDeviceInfoStruct4Watch is null) continue;
+                    if (receivedDeviceInfoStruct4Watch is null) continue;
 
+                    lock (_receivedDeviceInfoStruct4WatchLock)
+                    {
                         foreach (var item in receivedDeviceInfoStruct4Watch)
                         {
                             if (item.IsMainDevice)
                             {
-                                if (item.DeviceServerBuildTime.ToUniversalTime()
-                                    < earliestBuiltServerTime)
+                                if (item.DeviceServerBuildTime.ToUniversalTime() < earliestBuiltServerTime)
                                 {
                                     serverPort = item.DeviceServerPort;
                                     serverAddress = item.IPv4;
                                 }
                                 hadMainDevice = true;
                             }
                         }
+                    }
 
-                        ++checkedTime;
-
-                        Log.Information($"In Watch4MainDevice: " +
-                            $"Watched for {checkedTime} times.");
+                    ++checkedTime;
 
-                        if (checkedTime == 7)
-                        {
-                            receivedDeviceInfoStruct4Watch?.Clear();
-                            receivedDeviceInfoStruct4Watch = null;
-                            WatchingOver(hadMainDevice, serverAddress, serverPort);
-                        }
+                    Log.Information($"In {location}: Watched for {checkedTime} times.");
 
-                        Thread.Sleep(1 * 1000); //  Sleep 1 second.
-                    }
-                    catch (Exception e)
+                    if (checkedTime == 7)
                     {
                         receivedDeviceInfoStruct4Watch?.Clear();
                         receivedDeviceInfoStruct4Watch = null;
 
-                        Log.Error(e, "In Watch4MainDevice");
+                        WatchingOver(hadMainDevice, serverAddress, serverPort);
                     }
+
+                    Thread.Sleep(1 * 1000); //  Sleep 1 second.
                 }
-            }
-            catch (Exception ex)
-            {
-                receivedDeviceInfoStruct4Watch?.Clear();
-                receivedDeviceInfoStruct4Watch = null;
+                catch (Exception e)
+                {
+                    receivedDeviceInfoStruct4Watch?.Clear();
+                    receivedDeviceInfoStruct4Watch = null;
+
+                    Log.Error(e, $"In {location}: {e.Message} Rewatch.");
 
-                Log.Error(ex, "In Watch4MainDevice");
+                    Watch4MainDevice();
+                }
             }
         }).Start();
     }
 
     /// <summary>
     /// 观察结束
     /// </summary>
-    internal static void WatchingOver(bool hadMainDevice, string serverAddress, int serverPort)
+    internal static async void WatchingOver(bool foundMainDevice, string serverAddress, int serverPort)
     {
-        Log.Information($"In WatchingOver: hadMainDevice: {hadMainDevice}, " +
-            $"serverAddress: {serverAddress}, serverPort: {serverPort}");
+        var location = $"{nameof(DevicesManager)}.{nameof(WatchingOver)}";
+
+        Log.Information($"In {location}: " +
+            $"{nameof(foundMainDevice)} -> {foundMainDevice}, " +
+            $"{nameof(serverAddress)} -> {serverAddress}, " +
+            $"{nameof(serverPort)} -> {serverPort}");
 
-        if (hadMainDevice)
+        if (foundMainDevice)
         {
-            Program.WebManager?.devicesServer?.AttendServer(serverAddress, serverPort);
+            var client = Program.WebManager?.devicesClient;
+
+            if (client is null) return;
+
+            await client
+                .SetServerAddress(serverAddress)
+                .SetServerPort(serverPort)
+                .Start()
+                ;
         }
         else
         {
-            Program.WebManager?.devicesServer?.BuildServer();
+            Program.WebManager?.devicesServer?.Start();
         }
     }
 }

Managers/TasksManager.cs

@@ -1,6 +1,8 @@
 using Common.BasicHelper.Utils.Extensions;
+using Serilog;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace KitX_Dashboard.Managers;
 
@@ -33,4 +35,40 @@ internal void SignalRun(string signal, Action action)
             SignalTasks[signal].Enqueue(action);
         else SignalTasks.Add(signal, new Queue<Action>().Push(action));
     }
+
+    /// <summary>
+    /// 执行任务, 并带有更好的日志显示
+    /// </summary>
+    /// <param name="action">要执行的动作</param>
+    /// <param name="name">日志显示名称</param>
+    /// <param name="prompt">日志提示</param>
+    public static void RunTask(
+        Action action,
+        string name = nameof(Action),
+        string prompt = ">>> ")
+    {
+        Log.Information($"{prompt}Task `{name}` began.");
+
+        action();
+
+        Log.Information($"{prompt}Task `{name}` done.");
+    }
+
+    /// <summary>
+    /// 异步执行任务, 并带有更好的日志显示
+    /// </summary>
+    /// <param name="action">要执行的动作</param>
+    /// <param name="name">任务名称</param>
+    /// <param name="prompt">日志提示</param>
+    public static async Task RunTaskAsync(
+        Action action,
+        string name = nameof(Action),
+        string prompt = ">>> ")
+    {
+        Log.Information($"{prompt}Task `{name}` began.");
+
+        await Task.Run(action);
+
+        Log.Information($"{prompt}Task `{name}` done.");
+    }
 }