yeziuku/FunGame-Core
1
0
Fork 0
forked from project-redbud/FunGame-Core
Code Pull Requests Activity

Update DataRequest And Socket MISC. (#24)

Browse Source 
* Update DataRequest And Socket MISC.

* Delete unused code
This commit is contained in:
milimoe 2023-05-23 09:22:02 +08:00 committed by GitHub
parent 185fea4b40
commit 3eda4b8167
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Api/Transmittal/DataRequest.cs
View File

@ -1,13 +1,17 @@
using System.Collections;
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Library.Common.Architecture;
using Milimoe.FunGame.Core.Library.Common.Network;
using Milimoe.FunGame.Core.Library.Constant;
using Milimoe.FunGame.Core.Library.Exception;
namespace Milimoe.FunGame.Core.Api.Transmittal
{
public class DataRequest
{
public bool Success => Worker.Success;
public string Error => Worker.Error;
public object? this[string key] => Worker.ResultData[key];
private readonly Request Worker;
public DataRequest(Socket Socket, DataRequestType RequestType)
@ -20,13 +24,11 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
Worker.RequestData.Add(key, value);
}
public async Task SendRequest()
public void SendRequest()
{
await Worker.SendRequest();
Worker.SendRequest();
}
public object? this[string key] => Worker.ResultData[key];
public T? GetResult<T>(string key)
{
object? obj = this[key];
@ -41,33 +43,36 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
{
public Hashtable RequestData { get; } = new();
public Hashtable ResultData => _Result;
public bool Success => _Success;
public string Error => _Error;
private bool JobFinish = false;
private readonly Socket? Socket;
private readonly DataRequestType RequestType;
private bool _Finish = false;
private bool _Success = false;
private string _Error = "";
private Hashtable _Result = new();
public async Task<RequestResult> SendRequest()
public void SendRequest()
{
try
{
if (Socket?.Send(SocketMessageType.DataRequest, RequestData) == SocketResult.Success)
{
await Task.Run(() =>
if (Socket?.Send(SocketMessageType.DataRequest, RequestType, RequestData) == SocketResult.Success)
{
while (true)
{
if (JobFinish) break;
if (_Finish) break;
Thread.Sleep(100);
}
});
}
}
catch
catch (Exception e)
{
return RequestResult.Fail;
_Finish = true;
_Success = false;
_Error = e.GetErrorInfo();
}
return RequestResult.Success;
}
public Request(Socket? socket, DataRequestType requestType) : base(socket)
@ -77,6 +82,8 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
}
public override void SocketHandler(SocketObject SocketObject)
{
try
{
if (SocketObject.SocketType == SocketMessageType.DataRequest)
{
@ -85,10 +92,18 @@ namespace Milimoe.FunGame.Core.Api.Transmittal
{
Dispose();
_Result = SocketObject.GetParam<Hashtable>(1) ?? new();
JobFinish = true;
_Finish = true;
_Success = true;
}
}
}
catch (Exception e)
{
_Finish = true;
_Success = false;
_Error = e.GetErrorInfo();
}
}
}
}
}

1
Library/Constant/ConstantSet.cs
View File

@ -30,6 +30,7 @@
public const string Socket = "Socket";
public const string Unknown = "Unknown";
public const string DataRequest = "DataRequest";
public const string Connect = "Connect";
public const string GetNotice = "GetNotice";
public const string Login = "Login";

6
Library/Constant/TypeEnum.cs
View File

@ -8,7 +8,8 @@
Inventory,
RoomSetting,
Store,
UserCenter
UserCenter,
ForgetPassword
}
public enum OpenFormType
@ -78,7 +79,8 @@
public enum DataRequestType
{
UnKnown
UnKnown,
GetFindPasswordVerifyCode
}
public enum SocketRuntimeType

1
Service/SocketManager.cs
View File

@ -268,6 +268,7 @@ namespace Milimoe.FunGame.Core.Service
{
return type switch
{
SocketMessageType.DataRequest => SocketSet.DataRequest,
SocketMessageType.Connect => SocketSet.Connect,
SocketMessageType.GetNotice => SocketSet.GetNotice,
SocketMessageType.Login => SocketSet.Login,