feat(RpcSession): 扩展RPC会话功能并重构数据管理

- 新增IRpcSessionData接口定义RPC会话数据规范
- 重命名RpcData为RpcSessionData并实现接口
- 为Call方法添加泛型支持
- 新增Stop、Tick等会话管理方法
- 优化回复消息处理流程

Author: AlianBlank

GameFrameX.NetWork.Abstractions/IRpcSession.cs

@@ -42,11 +42,36 @@ public interface IRpcSession
     /// <param name="message">调用消息对象</param>
     /// <param name="timeOutMillisecond">调用超时,单位毫秒,默认10秒</param>
     /// <returns>返回消息对象</returns>
-    Task<IRpcResult> Call(IRequestMessage message, int timeOutMillisecond = 10000);
+    /// <typeparam name="T">返回消息对象类型</typeparam>
+    Task<IRpcResult> Call<T>(IRequestMessage message, int timeOutMillisecond = 10000) where T : IResponseMessage, new();
 
     /// <summary>
     /// 异步发送,不等待结果
     /// </summary>
     /// <param name="message">调用消息对象</param>
     void Send(IRequestMessage message);
+
+    /// <summary>
+    /// 处理消息队列
+    /// </summary>
+    /// <returns>处理结果</returns>
+    IRpcSessionData Handler();
+
+    /// <summary>
+    /// 回复消息
+    /// </summary>
+    /// <param name="message">回复消息对象</param>
+    /// <returns>是否成功回复</returns>
+    bool Reply(IResponseMessage message);
+
+    /// <summary>
+    /// 处理消息队列
+    /// </summary>
+    /// <param name="elapseMillisecondsTime">时间间隔,单位毫秒</param>
+    void Tick(int elapseMillisecondsTime);
+
+    /// <summary>
+    /// 停止会话
+    /// </summary>
+    void Stop();
 }

GameFrameX.NetWork.Abstractions/IRpcSessionData.cs

@@ -0,0 +1,72 @@
+// ==========================================================================================
+//  GameFrameX 组织及其衍生项目的版权、商标、专利及其他相关权利
+//  GameFrameX organization and its derivative projects' copyrights, trademarks, patents, and related rights
+//  均受中华人民共和国及相关国际法律法规保护。
+//  are protected by the laws of the People's Republic of China and relevant international regulations.
+// 
+//  使用本项目须严格遵守相应法律法规及开源许可证之规定。
+//  Usage of this project must strictly comply with applicable laws, regulations, and open-source licenses.
+// 
+//  本项目采用 MIT 许可证与 Apache License 2.0 双许可证分发，
+//  This project is dual-licensed under the MIT License and Apache License 2.0,
+//  完整许可证文本请参见源代码根目录下的 LICENSE 文件。
+//  please refer to the LICENSE file in the root directory of the source code for the full license text.
+// 
+//  禁止利用本项目实施任何危害国家安全、破坏社会秩序、
+//  It is prohibited to use this project to engage in any activities that endanger national security, disrupt social order,
+//  侵犯他人合法权益等法律法规所禁止的行为！
+//  or infringe upon the legitimate rights and interests of others, as prohibited by laws and regulations!
+//  因基于本项目二次开发所产生的一切法律纠纷与责任，
+//  Any legal disputes and liabilities arising from secondary development based on this project
+//  本项目组织与贡献者概不承担。
+//  shall be borne solely by the developer; the project organization and contributors assume no responsibility.
+// 
+//  GitHub 仓库：https://github.com/GameFrameX
+//  GitHub Repository: https://github.com/GameFrameX
+//  Gitee  仓库：https://gitee.com/GameFrameX
+//  Gitee Repository:  https://gitee.com/GameFrameX
+//  官方文档：https://gameframex.doc.alianblank.com/
+//  Official Documentation: https://gameframex.doc.alianblank.com/
+// ==========================================================================================
+
+namespace GameFrameX.NetWork.Abstractions;
+
+/// <summary>
+/// RPC会话数据接口
+/// </summary>
+public interface IRpcSessionData
+{
+    /// <summary>
+    /// 任务
+    /// </summary>
+    Task<IRpcResult> Task { get; }
+
+    /// <summary>
+    /// 是否回复消息
+    /// </summary>
+    bool IsReply { get; }
+
+    /// <summary>
+    /// 唯一ID,用于标识RPC会话
+    /// </summary>
+    long UniqueId { get; }
+
+    /// <summary>
+    /// 请求消息
+    /// </summary>
+    INetworkMessage RequestMessage { get; }
+
+    /// <summary>
+    /// 回复消息
+    /// </summary>
+    /// <param name="message">回复消息对象</param>
+    /// <returns>是否成功回复</returns>
+    bool Reply(IResponseMessage message);
+
+    /// <summary>
+    /// 增加时间。如果超时返回true
+    /// </summary>
+    /// <param name="millisecondsTime">流逝时间.单位毫秒</param>
+    /// <returns>是否超时</returns>
+    bool IncrementalElapseTime(long millisecondsTime);
+}

GameFrameX.NetWork/RpcSession.RpcData.cs

@@ -38,7 +38,7 @@ namespace GameFrameX.NetWork;
 /// <summary>
 /// RPC 数据
 /// </summary>
-public sealed class RpcData : IDisposable
+public sealed class RpcSessionData : IRpcSessionData, IDisposable
 {
     private readonly TaskCompletionSource<IRpcResult> _tcs;
 
@@ -48,7 +48,7 @@ public sealed class RpcData : IDisposable
     /// <param name="requestMessage">请求消息</param>
     /// <param name="isReply">是否需要回复</param>
     /// <param name="timeout">超时时间,单位毫秒,默认10秒</param>
-    private RpcData(IRequestMessage requestMessage, bool isReply = true, int timeout = 10000)
+    private RpcSessionData(IRequestMessage requestMessage, bool isReply = true, int timeout = 10000)
     {
         CreatedTime = TimerHelper.UnixTimeMilliseconds();
         RequestMessage = requestMessage;
@@ -89,12 +89,12 @@ public long UniqueId
     /// <summary>
     /// 请求消息
     /// </summary>
-    public IRequestMessage RequestMessage { get; private set; }
+    public INetworkMessage RequestMessage { get; private set; }
 
     /// <summary>
     /// 响应消息
     /// </summary>
-    public IResponseMessage ResponseMessage { get; private set; }
+    public INetworkMessage ResponseMessage { get; private set; }
 
     /// <summary>
     /// RPC 耗时时间.单位毫秒
@@ -126,12 +126,13 @@ public void Dispose()
     /// RPC 回复
     /// </summary>
     /// <param name="responseMessage"></param>
-    public void Reply(IResponseMessage responseMessage)
+    public bool Reply(IResponseMessage responseMessage)
     {
         ResponseMessage = responseMessage;
         Time = TimerHelper.UnixTimeMilliseconds() - CreatedTime;
         var result = new RpcResult(responseMessage);
         _tcs.SetResult(result);
+        return true;
     }
 
     /// <summary>
@@ -141,9 +142,9 @@ public void Reply(IResponseMessage responseMessage)
     /// <param name="isReply">是否需要回复</param>
     /// <param name="timeout">超时时间,单位毫秒</param>
     /// <returns></returns>
-    public static RpcData Create(IRequestMessage requestMessage, bool isReply = true, int timeout = 10000)
+    public static IRpcSessionData Create(IRequestMessage requestMessage, bool isReply = true, int timeout = 10000)
     {
-        var rpcData = new RpcData(requestMessage, isReply, timeout);
+        var rpcData = new RpcSessionData(requestMessage, isReply, timeout);
         return rpcData;
     }
 
@@ -152,7 +153,7 @@ public static RpcData Create(IRequestMessage requestMessage, bool isReply = true
     /// </summary>
     /// <param name="millisecondsTime">流逝时间.单位毫秒</param>
     /// <returns></returns>
-    internal bool IncrementalElapseTime(long millisecondsTime)
+    public bool IncrementalElapseTime(long millisecondsTime)
     {
         ElapseTime += millisecondsTime;
         if (ElapseTime >= Timeout)
@@ -168,7 +169,7 @@ internal bool IncrementalElapseTime(long millisecondsTime)
     /// <summary>
     /// 析构函数
     /// </summary>
-    ~RpcData()
+    ~RpcSessionData()
     {
         Dispose();
     }

GameFrameX.NetWork/RpcSession.cs

@@ -30,7 +30,6 @@
 // ==========================================================================================
 
 
-
 using System.Collections.Concurrent;
 using GameFrameX.NetWork.Abstractions;
 
@@ -49,12 +48,12 @@ public sealed class RpcSession : IRpcSession, IDisposable
     /// <summary>
     /// RPC处理队列
     /// </summary>
-    private readonly ConcurrentDictionary<long, RpcData> _rpcHandlingObjects = new();
+    private readonly ConcurrentDictionary<long, IRpcSessionData> _rpcHandlingObjects = new();
 
     /// <summary>
     /// 等待队列
     /// </summary>
-    private readonly ConcurrentQueue<RpcData> _waitingObjects = new();
+    private readonly ConcurrentQueue<IRpcSessionData> _waitingObjects = new();
 
     /// <summary>
     /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
@@ -72,9 +71,9 @@ public void Dispose()
     /// <param name="message">调用消息对象</param>
     /// <param name="timeOutMillisecond">调用超时,单位毫秒,默认10秒</param>
     /// <returns>返回消息对象</returns>
-    public Task<IRpcResult> Call(IRequestMessage message, int timeOutMillisecond = 10000)
+    public Task<IRpcResult> Call<T>(IRequestMessage message, int timeOutMillisecond = 10000) where T : IResponseMessage, new()
     {
-        var rpcData = RpcData.Create(message, true, timeOutMillisecond);
+        var rpcData = RpcSessionData.Create(message, true, timeOutMillisecond);
         _waitingObjects.Enqueue(rpcData);
         return rpcData.Task;
     }
@@ -85,15 +84,15 @@ public Task<IRpcResult> Call(IRequestMessage message, int timeOutMillisecond = 1
     /// <param name="message">调用消息对象</param>
     public void Send(IRequestMessage message)
     {
-        var actorObject = RpcData.Create(message, false);
+        var actorObject = RpcSessionData.Create(message, false);
         _waitingObjects.Enqueue(actorObject);
     }
 
     /// <summary>
     /// 处理消息队列
     /// </summary>
-    /// <returns></returns>
-    public RpcData TryPeek()
+    /// <returns>等待处理的消息对象</returns>
+    public IRpcSessionData TryPeek()
     {
         if (_waitingObjects.TryPeek(out var message))
         {
@@ -106,8 +105,8 @@ public RpcData TryPeek()
     /// <summary>
     /// 处理消息队列
     /// </summary>
-    /// <returns></returns>
-    public RpcData Handler()
+    /// <returns>处理的消息对象</returns>
+    public IRpcSessionData Handler()
     {
         if (_waitingObjects.TryDequeue(out var message))
         {
@@ -123,16 +122,15 @@ public RpcData Handler()
     }
 
     /// <summary>
-    /// 回复
+    /// 回复消息
     /// </summary>
-    /// <param name="message"></param>
-    /// <returns></returns>
+    /// <param name="message">回复消息对象</param>
+    /// <returns>是否成功回复</returns>
     public bool Reply(IResponseMessage message)
     {
         if (_rpcHandlingObjects.TryRemove(message.UniqueId, out var rpcData))
         {
-            rpcData.Reply(message);
-            return true;
+            return rpcData.Reply(message);
         }
 
         return false;