wiz0u/WTelegramClient
1
0
Fork 0
mirror of https://github.com/wiz0u/WTelegramClient.git synced 2026-04-05 14:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update callback is now void (or async void)

Browse source 
Added ListenUpdates example
This commit is contained in:
Wizou 2021-09-05 01:08:16 +02:00
parent 3b8ec9d910
commit dcd384ed27
3 changed files with 115 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Client.cs
View file

@ -19,8 +19,9 @@ namespace WTelegram
{
public sealed partial class Client : IDisposable
{
public event Func<ITLObject, Task> Update;
public event Action<ITLObject> Update;
public Config TLConfig { get; private set; }
private readonly Func<string, string> _config;
private readonly int _apiId;
private readonly string _apiHash;
@ -49,8 +50,6 @@ namespace WTelegram
_session = Session.LoadOrCreate(Config("session_pathname"), Convert.FromHexString(_apiHash));
}
private Task OnUpdate(ITLObject obj) => Update?.Invoke(obj) ?? Task.CompletedTask;
public string Config(string config)
=> _config(config) ?? DefaultConfig(config) ?? throw new ApplicationException("You must provide a config value for " + config);
@ -597,10 +596,10 @@ namespace WTelegram
_ = SendAsync(MakeFunction(new Pong { msg_id = _lastRecvMsgId, ping_id = ping.ping_id }), false);
break;
case Pong pong:
await SetResult(pong.msg_id, pong);
SetResult(pong.msg_id, pong);
break;
case FutureSalts futureSalts:
await SetResult(futureSalts.req_msg_id, futureSalts);
SetResult(futureSalts.req_msg_id, futureSalts);
break;
case RpcResult rpcResult:
break; // SetResult was already done in ReadRpcResult
@ -616,7 +615,7 @@ namespace WTelegram
_ = Task.Run(() => tcs.SetException(new ApplicationException($"BadMsgNotification {badMsgNotification.error_code}")));
}
else
await OnUpdate(obj);
OnUpdate(obj);
}
break;
default:
@ -627,19 +626,32 @@ namespace WTelegram
{
_bareRequest = 0;
_ = Task.Run(() => tcs.SetResult(obj));
break;
}
}
await OnUpdate(obj);
OnUpdate(obj);
break;
}
async Task SetResult(long msgId, object result)
void SetResult(long msgId, object result)
{
var (type, tcs) = PullPendingRequest(msgId);
if (tcs != null)
_ = Task.Run(() => tcs.SetResult(result));
else
await OnUpdate(obj);
OnUpdate(obj);
}
}
private void OnUpdate(ITLObject obj)
{
try
{
Update?.Invoke(obj);
}
catch (Exception ex)
{
Helpers.Log(4, $"Update callback on {obj.GetType().Name} raised {ex}");
}
}
@ -721,7 +733,7 @@ namespace WTelegram
{
var waitUntil = DateTime.UtcNow.AddSeconds(3);
if (signUpRequired.terms_of_service != null)
await OnUpdate(signUpRequired.terms_of_service); // give caller the possibility to read and accept TOS
OnUpdate(signUpRequired.terms_of_service); // give caller the possibility to read and accept TOS
var first_name = Config("first_name");
var last_name = Config("last_name");
var wait = waitUntil - DateTime.UtcNow;

1
src/WTelegramClient.csproj
View file

@ -38,6 +38,7 @@
<None Include="..\logo.png" Link="Data\logo.png" Pack="true" PackagePath="\" />
<None Include="..\README.md" Link="Data\README.md" Pack="true" PackagePath="\" />
<None Include="..\.github\release.yml" Link="Data\release.yml" />
<None Include="..\Examples\*.cs" Link="Data\Examples\%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>