命令树优化,测试编辑区域优化
This commit is contained in:
@@ -4,14 +4,29 @@ using System.Text;
|
||||
|
||||
namespace DeviceCommand.Flexible
|
||||
{
|
||||
/// <summary>
|
||||
/// 灵活型 TCP 通信类(免实例化,每次调用临时建立 TCP 连接)。
|
||||
/// 支持字节/文本发送、定长字节读取、按结束符读取文本行四种操作,
|
||||
/// 内部使用通信锁保证同一时刻只有一个 TCP 事务在执行,
|
||||
/// 适用于偶发性、无需保持长连接的 TCP 设备通信场景。
|
||||
/// </summary>
|
||||
[ACPCommand]
|
||||
public static class FTCP
|
||||
{
|
||||
// 通信锁:保证同一时刻只有一个 TCP 事务在执行
|
||||
private static readonly SemaphoreSlim _commLock = new(1, 1);
|
||||
|
||||
#region Send
|
||||
|
||||
public static async Task SendAsync(string ipAddress,int port,int sendTimeout, byte[] buffer, CancellationToken ct = default)
|
||||
/// <summary>
|
||||
/// 向指定 TCP 端点发送一段字节数据(发送完成后立即断开)。
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">设备 IP 地址</param>
|
||||
/// <param name="port">TCP 端口号</param>
|
||||
/// <param name="sendTimeout">发送超时时间(毫秒)</param>
|
||||
/// <param name="buffer">要发送的字节数组</param>
|
||||
/// <param name="ct">异步取消令牌</param>
|
||||
public static async Task 发送字节数据(string ipAddress,int port,int sendTimeout, byte[] buffer, CancellationToken ct = default)
|
||||
{
|
||||
await _commLock.WaitAsync(ct);
|
||||
try
|
||||
@@ -30,16 +45,33 @@ namespace DeviceCommand.Flexible
|
||||
}
|
||||
}
|
||||
|
||||
public static Task SendAsync(string ipAddress, int port,int sendTimeout, string text,CancellationToken ct = default)
|
||||
/// <summary>
|
||||
/// 向指定 TCP 端点发送一段文本(以 UTF8 编码为字节后发送,发送完成后立即断开)。
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">设备 IP 地址</param>
|
||||
/// <param name="port">TCP 端口号</param>
|
||||
/// <param name="sendTimeout">发送超时时间(毫秒)</param>
|
||||
/// <param name="text">要发送的文本字符串</param>
|
||||
/// <param name="ct">异步取消令牌</param>
|
||||
public static Task 发送文本数据(string ipAddress, int port,int sendTimeout, string text,CancellationToken ct = default)
|
||||
{
|
||||
return SendAsync( ipAddress, port, sendTimeout, Encoding.UTF8.GetBytes(text),ct);
|
||||
return 发送字节数据( ipAddress, port, sendTimeout, Encoding.UTF8.GetBytes(text),ct);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Read
|
||||
|
||||
public static async Task<byte[]> ReadAsync(string ipAddress,int port,int receiveTimeout,int length,CancellationToken ct = default)
|
||||
/// <summary>
|
||||
/// 连接指定 TCP 端点并读取指定长度的字节数据(连接关闭或读满为止)。
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">设备 IP 地址</param>
|
||||
/// <param name="port">TCP 端口号</param>
|
||||
/// <param name="receiveTimeout">接收超时时间(毫秒)</param>
|
||||
/// <param name="length">要读取的字节长度</param>
|
||||
/// <param name="ct">异步取消令牌</param>
|
||||
/// <returns>实际读取到的字节数组(对端提前关闭时可能短于请求长度)</returns>
|
||||
public static async Task<byte[]> 读取字节数据(string ipAddress,int port,int receiveTimeout,int length,CancellationToken ct = default)
|
||||
{
|
||||
await _commLock.WaitAsync(ct);
|
||||
try
|
||||
@@ -72,7 +104,16 @@ namespace DeviceCommand.Flexible
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task<string> ReadLineAsync( string ipAddress, int port, int receiveTimeout, string delimiter = "\n",CancellationToken ct = default)
|
||||
/// <summary>
|
||||
/// 连接指定 TCP 端点并读取一行文本,读取到结束符为止(返回内容不含结束符)。
|
||||
/// </summary>
|
||||
/// <param name="ipAddress">设备 IP 地址</param>
|
||||
/// <param name="port">TCP 端口号</param>
|
||||
/// <param name="receiveTimeout">接收超时时间(毫秒),超时未收到结束符抛出超时异常</param>
|
||||
/// <param name="delimiter">文本行结束符,默认换行符 "\n"</param>
|
||||
/// <param name="ct">异步取消令牌</param>
|
||||
/// <returns>去除结束符并去除首尾空白后的文本行</returns>
|
||||
public static async Task<string> 读取文本行( string ipAddress, int port, int receiveTimeout, string delimiter = "\n",CancellationToken ct = default)
|
||||
{
|
||||
await _commLock.WaitAsync(ct);
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user