refactor: 更新逻辑

Author: ArgoZhang

src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverter.cs

@@ -17,7 +17,6 @@ public class DataConverter<TEntity>(DataConverterCollections converters) : IData
     /// </summary>
     public DataConverter() : this(new())
     {
-
     }
 
     /// <summary>
@@ -28,9 +27,21 @@ public DataConverter() : this(new())
     /// <returns></returns>
     public virtual bool TryConvertTo(ReadOnlyMemory<byte> data, [NotNullWhen(true)] out TEntity? entity)
     {
-        var v = CreateEntity();
-        var ret = Parse(data, v);
-        entity = ret ? v : default;
+        var ret = false;
+        entity = default;
+        try
+        {
+            var v = CreateEntity();
+            if (Parse(data, v))
+            {
+                entity = v;
+                ret = true;
+            }
+        }
+        catch (Exception e)
+        {
+        }
+
         return ret;
     }
 
@@ -57,8 +68,7 @@ protected virtual bool Parse(ReadOnlyMemory<byte> data, TEntity entity)
             var properties = entity.GetType().GetProperties().Where(p => p.CanWrite).ToList();
             foreach (var p in properties)
             {
-                var attr = p.GetCustomAttribute<DataPropertyConverterAttribute>(false)
-                    ?? GetPropertyConverterAttribute(p);
+                var attr = p.GetCustomAttribute<DataPropertyConverterAttribute>(false) ?? GetPropertyConverterAttribute(p);
                 if (attr is { Type: not null })
                 {
                     var value = attr.ConvertTo(data);
@@ -69,8 +79,10 @@ protected virtual bool Parse(ReadOnlyMemory<byte> data, TEntity entity)
                     }
                 }
             }
+
             ret = true;
         }
+
         return ret;
     }
 
@@ -81,6 +93,7 @@ protected virtual bool Parse(ReadOnlyMemory<byte> data, TEntity entity)
         {
             attr = v;
         }
+
         return attr;
     }
 }

src/extensions/BootstrapBlazor.TcpSocket/Extensions/ITcpSocketClientExtensions.cs

@@ -111,7 +111,7 @@ public static void AddDataPackageAdapter(this ITcpSocketClient client, IDataPack
         client.AddDataPackageAdapter(new DataPackageAdapter(handler), callback);
     }
 
-    private static readonly Dictionary<ITcpSocketClient, List<(IDataPackageAdapter Adapter, Delegate Callback)>> EntityCache = [];
+    private static readonly Dictionary<ITcpSocketClient, List<(Func<ReadOnlyMemory<byte>, ValueTask> ReceivedCallback, Delegate EntityCallback)>> EntityCache = [];
 
     /// <summary>
     /// Configures the specified <see cref="ITcpSocketClient"/> to use a data package adapter and a callback function
@@ -135,11 +135,11 @@ async ValueTask ReceivedCallback(ReadOnlyMemory<byte> buffer)
 
         if (EntityCache.TryGetValue(client, out var list))
         {
-            list.Add((adapter, ReceivedCallback));
+            list.Add((ReceivedCallback, callback));
         }
         else
         {
-            Cache.Add(client, [(adapter, ReceivedCallback)]);
+            EntityCache.Add(client, [(ReceivedCallback, callback)]);
         }
 
         client.ReceivedCallBack += ReceivedCallback;
@@ -156,6 +156,24 @@ async ValueTask ReceivedCallback(ReadOnlyMemory<byte> buffer)
         };
     }
 
+    /// <summary>
+    /// 移除 <see cref="ITcpSocketClient"/> 数据适配器及其对应的回调方法
+    /// </summary>
+    /// <param name="client"></param>
+    /// <param name="callback"></param>
+    public static void RemoveDataPackageAdapter<TEntity>(this ITcpSocketClient client, Func<TEntity?, Task> callback)
+    {
+        if (EntityCache.TryGetValue(client, out var list))
+        {
+            var items = list.Where(i => i.EntityCallback.Equals(callback)).ToList();
+            foreach (var c in items)
+            {
+                client.ReceivedCallBack -= c.ReceivedCallback;
+                list.Remove(c);
+            }
+        }
+    }
+
     /// <summary>
     /// 通过指定 <see cref="IDataPackageHandler"/> 数据处理实例，设置数据适配器并配置回调方法
     /// </summary>
@@ -192,13 +210,15 @@ async ValueTask ReceivedCallback(ReadOnlyMemory<byte> buffer)
 
         if (EntityCache.TryGetValue(client, out var list))
         {
-            list.Add((adapter, ReceivedCallback));
+            list.Add((ReceivedCallback, callback));
         }
         else
         {
-            EntityCache.Add(client, [(adapter, ReceivedCallback)]);
+            EntityCache.Add(client, [(ReceivedCallback, callback)]);
         }
 
+        client.ReceivedCallBack += ReceivedCallback;
+
         IDataConverter<TEntity>? converter = null;
 
         var type = typeof(TEntity);
@@ -212,13 +232,21 @@ async ValueTask ReceivedCallback(ReadOnlyMemory<byte> buffer)
 
         if (converter == null)
         {
-            // 设置正常回调
+            // 未设置数据转换器返回 default 值
             adapter.ReceivedCallBack = async buffer => await callback(default);
         }
         else
         {
             // 设置转化器
-            adapter.SetDataAdapterCallback(converter, callback);
+            adapter.ReceivedCallBack = async buffer =>
+            {
+                TEntity? ret = default;
+                if (converter.TryConvertTo(buffer, out var t))
+                {
+                    ret = t;
+                }
+                await callback(ret);
+            };
         }
     }
 
@@ -233,19 +261,6 @@ public static void AddDataPackageAdapter<TEntity>(this ITcpSocketClient client,
         client.AddDataPackageAdapter(new DataPackageAdapter(handler), callback);
     }
 
-    private static void SetDataAdapterCallback<TEntity>(this IDataPackageAdapter adapter, IDataConverter<TEntity> converter, Func<TEntity?, Task> callback)
-    {
-        adapter.ReceivedCallBack = async buffer =>
-        {
-            TEntity? ret = default;
-            if (converter.TryConvertTo(buffer, out var t))
-            {
-                ret = t;
-            }
-            await callback(ret);
-        };
-    }
-
     private static IDataConverter<TEntity>? GetSocketDataConverter<TEntity>(this ITcpSocketClient client)
     {
         IDataConverter<TEntity>? converter = null;
@@ -259,22 +274,4 @@ private static void SetDataAdapterCallback<TEntity>(this IDataPackageAdapter ada
         }
         return converter;
     }
-
-    /// <summary>
-    /// 移除 <see cref="ITcpSocketClient"/> 数据适配器及其对应的回调方法
-    /// </summary>
-    /// <param name="client"></param>
-    /// <param name="callback"></param>
-    public static void RemoveDataPackageAdapter<TEntity>(this ITcpSocketClient client, Func<TEntity?, Task> callback)
-    {
-        if (EntityCache.TryGetValue(client, out var list))
-        {
-            var items = list.Where(i => i.Adapter.ReceivedCallBack == callback).ToList();
-            foreach (var c in items)
-            {
-                client.ReceivedCallBack -= c.Callback;
-                list.Remove(c);
-            }
-        }
-    }
 }