diff --git a/src/extensions/BootstrapBlazor.Socket/BootstrapBlazor.Socket.csproj b/src/extensions/BootstrapBlazor.Socket/BootstrapBlazor.Socket.csproj index ec3b5606..ec23b53b 100644 --- a/src/extensions/BootstrapBlazor.Socket/BootstrapBlazor.Socket.csproj +++ b/src/extensions/BootstrapBlazor.Socket/BootstrapBlazor.Socket.csproj @@ -1,7 +1,7 @@  - 9.0.4 + 9.0.5 @@ -9,10 +9,34 @@ BootstrapBlazor extensions of Socket + + 8.0.* + 9.0.* + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/src/extensions/BootstrapBlazor.Socket/DataAdapter/DataPackageAdapter.cs b/src/extensions/BootstrapBlazor.Socket/DataAdapter/DataPackageAdapter.cs index de35e3cb..b84d9d55 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataAdapter/DataPackageAdapter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataAdapter/DataPackageAdapter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataAdapters; +namespace BootstrapBlazor.Socket.DataAdapters; /// /// Provides a base implementation for adapting data packages between different systems or formats. diff --git a/src/extensions/BootstrapBlazor.Socket/DataAdapter/IDataPackageAdapter.cs b/src/extensions/BootstrapBlazor.Socket/DataAdapter/IDataPackageAdapter.cs index 282eeb34..382d8039 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataAdapter/IDataPackageAdapter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataAdapter/IDataPackageAdapter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataAdapters; +namespace BootstrapBlazor.Socket.DataAdapters; /// /// Defines an adapter for handling and transmitting data packages to a target destination. diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/BinConverter.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/BinConverter.cs index 58f6126a..fd4de25d 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/BinConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/BinConverter.cs @@ -4,7 +4,7 @@ using System.Text; -namespace BootstrapBlazor.Components.DataConverter; +namespace BootstrapBlazorSocket.DataConverter; /// /// 二进制 与 Byte 数组转换方法 diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverter.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverter.cs index 9af5aa74..9e55b514 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverter.cs @@ -2,9 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ +using BootstrapBlazor.Socket.Logging; using System.Reflection; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Provides a base class for converting socket data into a specified entity type. @@ -38,7 +39,10 @@ public virtual bool TryConvertTo(ReadOnlyMemory data, [NotNullWhen(true)] ret = true; } } - catch { } + catch (Exception ex) + { + SocketLogging.LogError(ex, "DataConverter TryConvertTo failed"); + } return ret; } diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverterCollections.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverterCollections.cs index 13a5b8e4..d0fc4654 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverterCollections.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataConverterCollections.cs @@ -6,7 +6,7 @@ using System.Linq.Expressions; using System.Reflection; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// 数据转换器集合类 diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataPropertyConverterAttribute.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataPropertyConverterAttribute.cs index 3111f799..4f714946 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataPropertyConverterAttribute.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataPropertyConverterAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Represents an attribute used to mark a field as a socket data field. diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataTypeConverterAttribute.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataTypeConverterAttribute.cs index 21cbfba1..37bc80bc 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/DataTypeConverterAttribute.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/DataTypeConverterAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/HexConverter.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/HexConverter.cs index e8e2e28e..41173163 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/HexConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/HexConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.Components.DataConverter; +namespace BootstrapBlazor.Socket.DataConverter; /// /// 十六进制 与 Byte 数组转换方法 diff --git a/src/extensions/BootstrapBlazor.Socket/DataConverter/IDataConverter.cs b/src/extensions/BootstrapBlazor.Socket/DataConverter/IDataConverter.cs index 7d29298a..c62d6590 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataConverter/IDataConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataConverter/IDataConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Socket 数据转换器接口 diff --git a/src/extensions/BootstrapBlazor.Socket/DataHandler/DataPackageHandlerBase.cs b/src/extensions/BootstrapBlazor.Socket/DataHandler/DataPackageHandlerBase.cs index 2417bc1c..17b6237f 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataHandler/DataPackageHandlerBase.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataHandler/DataPackageHandlerBase.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataHandlers; +namespace BootstrapBlazor.Socket.DataHandlers; /// /// Provides a base implementation for handling data packages in a communication system. diff --git a/src/extensions/BootstrapBlazor.Socket/DataHandler/DelimiterDataPackageHandler.cs b/src/extensions/BootstrapBlazor.Socket/DataHandler/DelimiterDataPackageHandler.cs index 6ab3a327..d988a189 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataHandler/DelimiterDataPackageHandler.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataHandler/DelimiterDataPackageHandler.cs @@ -5,7 +5,7 @@ using System.Buffers; using System.Text; -namespace BootstrapBlazor.DataHandlers; +namespace BootstrapBlazor.Socket.DataHandlers; /// /// Handles data packages that are delimited by a specific sequence of bytes or characters. diff --git a/src/extensions/BootstrapBlazor.Socket/DataHandler/FixLengthDataPackageHandler.cs b/src/extensions/BootstrapBlazor.Socket/DataHandler/FixLengthDataPackageHandler.cs index eed246c0..d71ba95a 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataHandler/FixLengthDataPackageHandler.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataHandler/FixLengthDataPackageHandler.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataHandlers; +namespace BootstrapBlazor.Socket.DataHandlers; /// /// Handles fixed-length data packages by processing incoming data of a specified length. diff --git a/src/extensions/BootstrapBlazor.Socket/DataHandler/IDataPackageHandler.cs b/src/extensions/BootstrapBlazor.Socket/DataHandler/IDataPackageHandler.cs index 6919d16d..58627a31 100644 --- a/src/extensions/BootstrapBlazor.Socket/DataHandler/IDataPackageHandler.cs +++ b/src/extensions/BootstrapBlazor.Socket/DataHandler/IDataPackageHandler.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataHandlers; +namespace BootstrapBlazor.Socket.DataHandlers; /// /// Defines an interface for adapting data packages to and from a TCP socket connection. diff --git a/src/extensions/BootstrapBlazor.Socket/Extensions/DataPropertyExtensions.cs b/src/extensions/BootstrapBlazor.Socket/Extensions/DataPropertyExtensions.cs index f9e1d34c..ad151917 100644 --- a/src/extensions/BootstrapBlazor.Socket/Extensions/DataPropertyExtensions.cs +++ b/src/extensions/BootstrapBlazor.Socket/Extensions/DataPropertyExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; static class DataPropertyExtensions { diff --git a/src/extensions/BootstrapBlazor.Socket/Logging/SocketLogging.cs b/src/extensions/BootstrapBlazor.Socket/Logging/SocketLogging.cs new file mode 100644 index 00000000..423f0b3d --- /dev/null +++ b/src/extensions/BootstrapBlazor.Socket/Logging/SocketLogging.cs @@ -0,0 +1,44 @@ +// Copyright (c) BootstrapBlazor & Argo Zhang (argo@live.ca). All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Website: https://www.blazor.zone or https://argozhang.github.io/ + +using Microsoft.Extensions.Logging; + +namespace BootstrapBlazor.Socket.Logging; + +/// +/// Socket 日志记录类 +/// +public static class SocketLogging +{ + private static ILogger? _logger; + private static bool _inited; + + /// + /// 返回 是否已经初始化 + /// + public static bool Inited => _inited; + + /// + /// 初始化 ILogger 实例 + /// + /// + public static void Init(ILogger logger) + { + _inited = true; + _logger = logger; + } + + /// + /// + /// + /// + public static void LogError(string message) => _logger?.LogError(message); + + /// + /// + /// + /// + /// + public static void LogError(Exception ex, string? message) => _logger?.LogError(ex, message); +} diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataBoolConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataBoolConverter.cs index 1b0dd9d7..f87e9a84 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataBoolConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataBoolConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 bool 数据转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataByteArrayConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataByteArrayConverter.cs index 0046a688..66eed9b3 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataByteArrayConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataByteArrayConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 byte[] 数组转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleBigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleBigEndianConverter.cs index b8641519..8f31aad0 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleBigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleBigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 double 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleLittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleLittleEndianConverter.cs index 5e3fba80..8ae7949a 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleLittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataDoubleLittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 double 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataEnumConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataEnumConverter.cs index d9bc9a19..e15eff11 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataEnumConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataEnumConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 Enum 数据转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16BigEndianConverter.cs index a1dbf2b7..b5aa8868 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 short 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16LittleEndianConverter.cs index e326fe7b..c8219846 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt16LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 short 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32BigEndianConverter.cs index 041f0d74..461d3d04 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 int 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32LittleEndianConverter.cs index ebb9b807..0266226d 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt32LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 int 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64BigEndianConverter.cs index e00c7bda..2e33954d 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 long 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64LittleEndianConverter.cs index 3d5cfa90..ef89ca7a 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataInt64LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 long 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleBigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleBigEndianConverter.cs index 1f1d4f02..94c29fe5 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleBigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleBigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 float 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleLittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleLittleEndianConverter.cs index 02ce9612..481d64ef 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleLittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataSingleLittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 float 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataStringConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataStringConverter.cs index 030e000e..354a8203 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataStringConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataStringConverter.cs @@ -4,7 +4,7 @@ using System.Text; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 string 数据转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16BigEndianConverter.cs index e40d5f69..c2ce855d 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 ushort 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16LittleEndianConverter.cs index d858be67..b677a0ce 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt16LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 ushort 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32BigEndianConverter.cs index efa8840b..6d1ceca1 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 uint 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32LittleEndianConverter.cs index ea0025f7..2e8f3ad7 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt32LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 uint 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64BigEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64BigEndianConverter.cs index d5e2b153..f2ab6383 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64BigEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64BigEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 ulong 数据大端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64LittleEndianConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64LittleEndianConverter.cs index 30e96113..4b354d29 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64LittleEndianConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/DataUInt64LittleEndianConverter.cs @@ -4,7 +4,7 @@ using System.Buffers.Binary; -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Sokcet 数据转换为 ulong 数据小端转换器 diff --git a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/IDataPropertyConverter.cs b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/IDataPropertyConverter.cs index b7938a7e..c95be6ac 100644 --- a/src/extensions/BootstrapBlazor.Socket/PropertyConverter/IDataPropertyConverter.cs +++ b/src/extensions/BootstrapBlazor.Socket/PropertyConverter/IDataPropertyConverter.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ -namespace BootstrapBlazor.DataConverters; +namespace BootstrapBlazor.Socket.DataConverters; /// /// Socket 数据转换器接口 diff --git a/src/extensions/BootstrapBlazor.TcpSocket/BootstrapBlazor.TcpSocket.csproj b/src/extensions/BootstrapBlazor.TcpSocket/BootstrapBlazor.TcpSocket.csproj index e94abb08..69c92032 100644 --- a/src/extensions/BootstrapBlazor.TcpSocket/BootstrapBlazor.TcpSocket.csproj +++ b/src/extensions/BootstrapBlazor.TcpSocket/BootstrapBlazor.TcpSocket.csproj @@ -1,7 +1,7 @@  - 9.0.4 + 9.0.5 @@ -39,9 +39,9 @@ - - - + + + diff --git a/src/extensions/BootstrapBlazor.TcpSocket/DefaultTcpSocketFactory.cs b/src/extensions/BootstrapBlazor.TcpSocket/DefaultTcpSocketFactory.cs index 7fb40486..bd181254 100644 --- a/src/extensions/BootstrapBlazor.TcpSocket/DefaultTcpSocketFactory.cs +++ b/src/extensions/BootstrapBlazor.TcpSocket/DefaultTcpSocketFactory.cs @@ -2,6 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ +using BootstrapBlazor.Socket.Logging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using System.Collections.Concurrent; using System.Runtime.Versioning; @@ -14,6 +17,14 @@ sealed class DefaultTcpSocketFactory(IServiceProvider provider) : ITcpSocketFact public ITcpSocketClient GetOrCreate(string name, Action valueFactory) { + if (!SocketLogging.Inited) + { + var logger = provider.GetService>(); + if (logger != null) + { + SocketLogging.Init(logger); + } + } return _pool.GetOrAdd(name, key => { var options = new TcpSocketClientOptions();