wiz0u/WTelegramClient
1
0
Fork 0
mirror of https://github.com/wiz0u/WTelegramClient.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved HTTP mode reliability

Browse source
This commit is contained in:
Wizou 2024-11-18 13:44:32 +01:00
parent 9ad6220527
commit fc441121a3
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/Client.cs
View file

@ -223,7 +223,7 @@ namespace WTelegram
{ {
try try
{ {
if (CheckMsgsToAck() is MsgsAck msgsAck) if (_httpClient == null && CheckMsgsToAck() is MsgsAck msgsAck)
await SendAsync(msgsAck, false).WaitAsync(1000).ConfigureAwait(false); await SendAsync(msgsAck, false).WaitAsync(1000).ConfigureAwait(false);
} }
catch { } catch { }
@ -885,7 +885,10 @@ namespace WTelegram
#endif #endif
} }
else if (_httpClient != null) else if (_httpClient != null)
{
Helpers.Log(2, $"Using HTTP Mode");
_reactorTask = Task.CompletedTask; _reactorTask = Task.CompletedTask;
}
else else
{ {
endpoint = _dcSession?.EndPoint ?? GetDefaultEndpoint(out int defaultDc); endpoint = _dcSession?.EndPoint ?? GetDefaultEndpoint(out int defaultDc);
@ -1434,7 +1437,9 @@ namespace WTelegram
return; return;
} }
} }
await _sendSemaphore.WaitAsync(_cts.Token); Task receiveTask = null;
var sem = _sendSemaphore;
await sem.WaitAsync(_cts.Token);
try try
{ {
using var memStream = new MemoryStream(1024); using var memStream = new MemoryStream(1024);
@ -1494,32 +1499,30 @@ namespace WTelegram
#if OBFUSCATION #if OBFUSCATION
_sendCtr?.EncryptDecrypt(buffer, frameLength); _sendCtr?.EncryptDecrypt(buffer, frameLength);
#endif #endif
var sending = SendFrame(buffer, frameLength); if (_networkStream != null)
await _networkStream.WriteAsync(buffer, 0, frameLength);
else
receiveTask = SendReceiveHttp(buffer, frameLength);
_lastSentMsg = msg; _lastSentMsg = msg;
await sending;
} }
finally finally
{ {
_sendSemaphore.Release(); sem.Release();
} }
if (receiveTask != null) await receiveTask;
} }
private async Task SendFrame(byte[] buffer, int frameLength) private async Task SendReceiveHttp(byte[] buffer, int frameLength)
{ {
if (_networkStream != null) var endpoint = _dcSession?.EndPoint ?? GetDefaultEndpoint(out _);
await _networkStream.WriteAsync(buffer, 0, frameLength); var content = new ByteArrayContent(buffer, 4, frameLength - 4);
else var response = await _httpClient.PostAsync($"http://{endpoint}/api", content, _cts.Token);
{ if (response.StatusCode != HttpStatusCode.OK)
var endpoint = _dcSession?.EndPoint ?? GetDefaultEndpoint(out _); throw new RpcException((int)response.StatusCode, TransportError((int)response.StatusCode));
var content = new ByteArrayContent(buffer, 4, frameLength - 4); var data = await response.Content.ReadAsByteArrayAsync();
var response = await _httpClient.PostAsync($"http://{endpoint}/api", content); var obj = ReadFrame(data, data.Length);
if (response.StatusCode != HttpStatusCode.OK) if (obj != null)
throw new RpcException((int)response.StatusCode, TransportError((int)response.StatusCode)); await HandleMessageAsync(obj);
var data = await response.Content.ReadAsByteArrayAsync();
var obj = ReadFrame(data, data.Length);
if (obj != null)
_ = HandleMessageAsync(obj);
}
} }
/// <summary>Long poll on HTTP connections</summary> /// <summary>Long poll on HTTP connections</summary>
@ -1540,9 +1543,9 @@ namespace WTelegram
{ {
if (_bareRpc != null) throw new WTException("A bare request is already undergoing"); if (_bareRpc != null) throw new WTException("A bare request is already undergoing");
retry: retry:
_bareRpc = new Rpc { type = typeof(T) }; var bareRpc = _bareRpc = new Rpc { type = typeof(T) };
await SendAsync(request, false, _bareRpc); await SendAsync(request, false, _bareRpc);
var result = await _bareRpc.Task; var result = await bareRpc.Task;
if (result is ReactorError) goto retry; if (result is ReactorError) goto retry;
return (T)result; return (T)result;
} }
@ -1559,12 +1562,8 @@ namespace WTelegram
retry: retry:
var rpc = new Rpc { type = typeof(T) }; var rpc = new Rpc { type = typeof(T) };
await SendAsync(query, true, rpc); await SendAsync(query, true, rpc);
if (_httpClient != null && !rpc.Task.IsCompleted) while (_httpClient != null && !rpc.Task.IsCompleted)
{ await HttpWait(_httpWait); // need to wait a bit more in some case
// usually happens when a batch of unrelated messages were serialized before in the previous MsgContainer reply
await HttpWait(_httpWait); // wait a bit more
if (!rpc.Task.IsCompleted) rpc.tcs.TrySetException(new RpcException(417, "Missing RPC response via HTTP"));
}
var result = await rpc.Task; var result = await rpc.Task;
switch (result) switch (result)