Properly stop polling (#178)

voed · web-flow · commit 6bc1000dc5a2 · 2023-10-31T23:23:03.000+02:00
[FIX] Properly stop polling
diff --git a/TGBotFramework/BotFramework/Bot.cs b/TGBotFramework/BotFramework/Bot.cs
@@ -32,7 +32,10 @@ public class Bot: IHostedService, IBotInstance
         private TelegramBotClient client;
 
         private EventHandlerFactory factory;
-        
+
+        private CancellationTokenSource _recieveToken = new CancellationTokenSource();
+
+
         public Bot(IServiceProvider services, IServiceScopeFactory scopeFactory, Type startupType = null)
         {
             this.services = services;
@@ -50,6 +53,7 @@ async Task IHostedService.StopAsync(CancellationToken cancellationToken)
         {
             await client.DeleteWebhookAsync(cancellationToken: cancellationToken);
             await client.CloseAsync(cancellationToken);
+            _recieveToken.Cancel();
         }
 
         public string UserName { get; private set; }
@@ -125,7 +129,7 @@ private async Task StartListen(CancellationToken cancellationToken)
                 await client.DeleteWebhookAsync(false, cancellationToken);
 
                 var receiverOptions = new ReceiverOptions { AllowedUpdates = { }, ThrowPendingUpdates = false };
-                client.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, cancellationToken);
+                client.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _recieveToken.Token);
             }
         }
 
diff --git a/TGBotFramework/BotFramework/BotFramework.csproj b/TGBotFramework/BotFramework/BotFramework.csproj
@@ -31,7 +31,7 @@
   <ItemGroup>
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119">
       <PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,10 @@ public class Bot: IHostedService, IBotInstance`
`32`	`32`	`private TelegramBotClient client;`
`33`	`33`
`34`	`34`	`private EventHandlerFactory factory;`
`35`		`-`
	`35`	`+`
	`36`	`+ private CancellationTokenSource _recieveToken = new CancellationTokenSource();`
	`37`	`+`
	`38`	`+`
`36`	`39`	`public Bot(IServiceProvider services, IServiceScopeFactory scopeFactory, Type startupType = null)`
`37`	`40`	`{`
`38`	`41`	`this.services = services;`
`@@ -50,6 +53,7 @@ async Task IHostedService.StopAsync(CancellationToken cancellationToken)`
`50`	`53`	`{`
`51`	`54`	`await client.DeleteWebhookAsync(cancellationToken: cancellationToken);`
`52`	`55`	`await client.CloseAsync(cancellationToken);`
	`56`	`+ _recieveToken.Cancel();`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`public string UserName { get; private set; }`
`@@ -125,7 +129,7 @@ private async Task StartListen(CancellationToken cancellationToken)`
`125`	`129`	`await client.DeleteWebhookAsync(false, cancellationToken);`
`126`	`130`
`127`	`131`	`var receiverOptions = new ReceiverOptions { AllowedUpdates = { }, ThrowPendingUpdates = false };`
`128`		`- client.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, cancellationToken);`
	`132`	`+ client.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _recieveToken.Token);`
`129`	`133`	`}`
`130`	`134`	`}`
`131`	`135`