PHXH
/
csharp-sdk-upm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: 简化缓存的请求/应答

oneRain 2020-06-28 12:30:29 +08:00
parent 4a6cf1ea09
commit 5976f5dbb3
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Realtime/Realtime/Internal/Connection/LCConnection.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Text; using System.Text;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -12,6 +13,17 @@ namespace LeanCloud.Realtime.Internal.Connection {
/// 连接层，只与数据协议相关 /// 连接层，只与数据协议相关
/// </summary> /// </summary>
public class LCConnection { public class LCConnection {
// 请求/应答比对，即 I 相等
class RequestAndResponseComparer : IEqualityComparer<GenericCommand> {
public bool Equals(GenericCommand x, GenericCommand y) {
return true;
}
public int GetHashCode(GenericCommand obj) {
return obj.I;
}
}
/// <summary> /// <summary>
/// 连接状态 /// 连接状态
/// </summary> /// </summary>
@ -59,8 +71,7 @@ namespace LeanCloud.Realtime.Internal.Connection {
/// <summary> /// <summary>
/// 请求回调缓存 /// 请求回调缓存
/// </summary> /// </summary>
private readonly Dictionary<int, TaskCompletionSource<GenericCommand>> responses; private readonly Dictionary<GenericCommand, TaskCompletionSource<GenericCommand>> requestToResponses;
private readonly List<GenericCommand> sendingRequests;
private int requestI = 1; private int requestI = 1;
@ -79,8 +90,8 @@ namespace LeanCloud.Realtime.Internal.Connection {
internal LCConnection(string id) { internal LCConnection(string id) {
this.id = id; this.id = id;
responses = new Dictionary<int, TaskCompletionSource<GenericCommand>>(); requestToResponses = new Dictionary<GenericCommand, TaskCompletionSource<GenericCommand>>(new RequestAndResponseComparer());
sendingRequests = new List<GenericCommand>();
heartBeat = new LCHeartBeat(this, OnDisconnect); heartBeat = new LCHeartBeat(this, OnDisconnect);
router = new LCRTMRouter(); router = new LCRTMRouter();
ws = new LCWebSocketClient { ws = new LCWebSocketClient {
@ -130,25 +141,23 @@ namespace LeanCloud.Realtime.Internal.Connection {
/// <returns></returns> /// <returns></returns>
internal async Task<GenericCommand> SendRequest(GenericCommand request) { internal async Task<GenericCommand> SendRequest(GenericCommand request) {
if (IsIdempotentCommand(request)) { if (IsIdempotentCommand(request)) {
GenericCommand sendingReq = sendingRequests.Find(item => { GenericCommand sendingReq = requestToResponses.Keys.FirstOrDefault(item => {
// TRICK 除了 I 其他字段相等 // TRICK 除了 I 其他字段相等
request.I = item.I; request.I = item.I;
return Equals(request, item); return Equals(request, item);
}); });
if (sendingReq != null) { if (sendingReq != null) {
LCLogger.Warn("duplicated request"); LCLogger.Warn("duplicated request");
if (responses.TryGetValue(sendingReq.I, out TaskCompletionSource<GenericCommand> waitingTcs)) { if (requestToResponses.TryGetValue(sendingReq, out TaskCompletionSource<GenericCommand> waitingTcs)) {
return await waitingTcs.Task; return await waitingTcs.Task;
} }
LCLogger.Error($"error request: {request}"); LCLogger.Error($"error request: {request}");
} else {
sendingRequests.Add(request);
} }
} }
TaskCompletionSource<GenericCommand> tcs = new TaskCompletionSource<GenericCommand>(); TaskCompletionSource<GenericCommand> tcs = new TaskCompletionSource<GenericCommand>();
request.I = requestI++; request.I = requestI++;
responses.Add(request.I, tcs); requestToResponses.Add(request, tcs);
try { try {
await SendCommand(request); await SendCommand(request);
} catch (Exception e) { } catch (Exception e) {
@ -196,7 +205,7 @@ namespace LeanCloud.Realtime.Internal.Connection {
if (command.HasI) { if (command.HasI) {
// 应答 // 应答
int requestIndex = command.I; int requestIndex = command.I;
if (responses.TryGetValue(requestIndex, out TaskCompletionSource<GenericCommand> tcs)) { if (requestToResponses.TryGetValue(command, out TaskCompletionSource<GenericCommand> tcs)) {
if (command.HasErrorMessage) { if (command.HasErrorMessage) {
// 错误 // 错误
ErrorCommand error = command.ErrorMessage; ErrorCommand error = command.ErrorMessage;
@ -206,12 +215,9 @@ namespace LeanCloud.Realtime.Internal.Connection {
LCException exception = new LCException(code, detail); LCException exception = new LCException(code, detail);
tcs.TrySetException(exception); tcs.TrySetException(exception);
} else { } else {
sendingRequests.RemoveAll(item => {
return item.I == command.I;
});
tcs.TrySetResult(command); tcs.TrySetResult(command);
} }
responses.Remove(requestIndex); requestToResponses.Remove(command);
} else { } else {
LCLogger.Error($"No request for {requestIndex}"); LCLogger.Error($"No request for {requestIndex}");
} }