添加DataRequest返回结果 (#22)

* Add DataRequest Result Table

* Delete Unused ConcurrentQueue
This commit is contained in:
milimoe 2023-05-17 11:07:52 +08:00 committed by GitHub
parent 7a6819e92a
commit d7609de7f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions

View File

@ -8,7 +8,6 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
{ {
public class DataRequest public class DataRequest
{ {
private static readonly ConcurrentQueue<Request> Queue = new();
private readonly Request Worker; private readonly Request Worker;
public DataRequest(Socket Socket, DataRequestType RequestType) public DataRequest(Socket Socket, DataRequestType RequestType)
@ -23,11 +22,7 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
public async Task SendRequest() public async Task SendRequest()
{ {
Queue.AddAsync(Worker); await Worker.SendRequest();
if (await Worker.SendRequest() == RequestResult.Success)
{
Queue.Delete();
}
} }
public object? this[string key] => Worker.ResultData[key]; public object? this[string key] => Worker.ResultData[key];
@ -45,11 +40,12 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
private class Request : BaseModel private class Request : BaseModel
{ {
public Hashtable RequestData { get; } = new(); public Hashtable RequestData { get; } = new();
public Hashtable ResultData { get; } = new(); public Hashtable ResultData => _Result;
private bool JobFinish = false; private bool JobFinish = false;
private readonly Socket? Socket; private readonly Socket? Socket;
private readonly DataRequestType RequestType; private readonly DataRequestType RequestType;
private Hashtable _Result = new();
public async Task<RequestResult> SendRequest() public async Task<RequestResult> SendRequest()
{ {
@ -88,11 +84,7 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
if (type == RequestType) if (type == RequestType)
{ {
Dispose(); Dispose();
switch (RequestType) _Result = SocketObject.GetParam<Hashtable>(1) ?? new();
{
default:
break;
}
JobFinish = true; JobFinish = true;
} }
} }

View File

@ -78,7 +78,7 @@
public enum DataRequestType public enum DataRequestType
{ {
UnKnown
} }
public enum SocketRuntimeType public enum SocketRuntimeType