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

TL deserialization errors no longer cause a ReactorError. Renewing session on layer change to prevent old layer messages

Browse source
This commit is contained in:
Wizou 2024-06-15 17:35:25 +02:00
parent 85cc404213
commit 1a00ae5a77
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Examples/Program_ReactorError.cs
View file

@ -50,7 +50,7 @@ namespace WTelegramClientTest
await CreateAndConnect(); await CreateAndConnect();
break; break;
} }
catch (Exception ex) catch (Exception ex) when (ex is not ObjectDisposedException)
{ {
Console.WriteLine("Connection still failing: " + ex.Message); Console.WriteLine("Connection still failing: " + ex.Message);
} }

33
src/Client.cs
View file

@ -465,21 +465,29 @@ namespace WTelegram
Helpers.Log(1, $"{_dcSession.DcID}>Ignoring 0x{ctorNb:X8} because of wrong timestamp {msgStamp:u} - {utcNow:u} Δ={new TimeSpan(_dcSession.ServerTicksOffset):c}"); Helpers.Log(1, $"{_dcSession.DcID}>Ignoring 0x{ctorNb:X8} because of wrong timestamp {msgStamp:u} - {utcNow:u} Δ={new TimeSpan(_dcSession.ServerTicksOffset):c}");
return null; return null;
} }
if (ctorNb == Layer.MsgContainerCtor) try
{ {
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {"MsgContainer",-40} {msgStamp:u} (svc)"); if (ctorNb == Layer.MsgContainerCtor)
return ReadMsgContainer(reader); {
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {"MsgContainer",-40} {msgStamp:u} (svc)");
return ReadMsgContainer(reader);
}
else if (ctorNb == Layer.RpcResultCtor)
{
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {"RpcResult",-40} {msgStamp:u}");
return ReadRpcResult(reader);
}
else
{
var obj = reader.ReadTLObject(ctorNb);
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {obj.GetType().Name,-40} {msgStamp:u} {((seqno & 1) != 0 ? "" : "(svc)")} {((msgId & 2) == 0 ? "" : "NAR")}");
return obj;
}
} }
else if (ctorNb == Layer.RpcResultCtor) catch (Exception ex)
{ {
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {"RpcResult",-40} {msgStamp:u}"); Helpers.Log(4, $"While deserializing frame #{ctorNb:x}: " + ex.ToString());
return ReadRpcResult(reader); return null;
}
else
{
var obj = reader.ReadTLObject(ctorNb);
Helpers.Log(1, $"{_dcSession.DcID}>Receiving {obj.GetType().Name,-40} {msgStamp:u} {((seqno & 1) != 0 ? "" : "(svc)")} {((msgId & 2) == 0 ? "" : "NAR")}");
return obj;
} }
} }
@ -916,6 +924,7 @@ namespace WTelegram
TLConfig = new Config { this_dc = _session.MainDC, dc_options = _session.DcOptions }; TLConfig = new Config { this_dc = _session.MainDC, dc_options = _session.DcOptions };
else else
{ {
if (_dcSession.Layer != 0 && _dcSession.Layer != Layer.Version) _dcSession.Renew();
var initParams = JSONValue.FromJsonElement(System.Text.Json.JsonDocument.Parse(Config("init_params")).RootElement); var initParams = JSONValue.FromJsonElement(System.Text.Json.JsonDocument.Parse(Config("init_params")).RootElement);
TLConfig = await this.InvokeWithLayer(Layer.Version, TLConfig = await this.InvokeWithLayer(Layer.Version,
new TL.Methods.InitConnection<Config> new TL.Methods.InitConnection<Config>