1
This commit is contained in:
@@ -170,8 +170,16 @@ namespace BITKit.Net
|
||||
var id = reader.ReadInt32();
|
||||
try
|
||||
{
|
||||
var value = BITBinary.Read(reader);
|
||||
_p2p.TryAdd(id,value);
|
||||
if (reader.ReadBoolean())
|
||||
{
|
||||
var value = BITBinary.Read(reader);
|
||||
_p2p.TryAdd(id,value);
|
||||
}
|
||||
else
|
||||
{
|
||||
var message = reader.ReadString();
|
||||
_p2p.TryAdd(id,new Exception(message));
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -189,21 +197,30 @@ namespace BITKit.Net
|
||||
{
|
||||
throw new NotImplementedException($"未找到对应的方法:{commandObj.GetType().FullName}");
|
||||
}
|
||||
|
||||
var value = await func.As<Func<object, UniTask<object>>>().Invoke(commandObj);
|
||||
using var _ms = new MemoryStream();
|
||||
using var _writer = new BinaryWriter(_ms);
|
||||
_writer.Write((byte)NetCommandType.ReturnToServer);
|
||||
_writer.Write(requestId);
|
||||
BITBinary.Write(_writer, value);
|
||||
var _bytes = _ms.ToArray();
|
||||
commandQueue.Enqueue(_bytes);
|
||||
try
|
||||
{
|
||||
var value = await func.As<Func<object, UniTask<object>>>().Invoke(commandObj);
|
||||
|
||||
_writer.Write(true);
|
||||
BITBinary.Write(_writer, value);
|
||||
var _bytes = _ms.ToArray();
|
||||
commandQueue.Enqueue(_bytes);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
BIT4Log.LogException(e);
|
||||
_writer.Write(false);
|
||||
_writer.Write(e.Message);
|
||||
}
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
BIT4Log.LogException(e);
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
BIT4Log.Log<KcpClient>($"未知消息类型:{type},字节:{(byte)type}");
|
||||
@@ -280,6 +297,10 @@ namespace BITKit.Net
|
||||
|
||||
if (_p2p.TryRemove(id, out var value))
|
||||
{
|
||||
if (value is Exception e)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
return (T)value;
|
||||
}
|
||||
await Task.Delay(100);
|
||||
|
Reference in New Issue
Block a user