fix(telegram): polling

satorijs · Aug 30, 2023 · a79001f · a79001f
1 parent e60f010
commit a79001f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/adapters/telegram/src/polling.ts b/adapters/telegram/src/polling.ts
@@ -34,8 +34,8 @@ export class HttpPolling extends Adapter.Client<TelegramBot> {
             offset: this.offset + 1,
             timeout: Math.ceil(bot.config.pollingTimeout / 1000), // in seconds
           })
-          if (bot.status === 'disconnect') {
-            return bot.offline()
+          if (bot.status === 'offline' || bot.status === 'disconnect') {
+            return
           }
           bot.online()
           _retryCount = 0
@@ -45,7 +45,7 @@ export class HttpPolling extends Adapter.Client<TelegramBot> {
             this.offset = Math.max(this.offset, e.update_id)
             handleUpdate(e, bot)
           }
-          setTimeout(polling, 0)
+          this.timeout = setTimeout(polling, 0)
         } catch (e) {
           if (!Quester.isAxiosError(e) || !e.response?.data) {
             // Other error
@@ -60,6 +60,9 @@ export class HttpPolling extends Adapter.Client<TelegramBot> {
             bot.error = e
             return bot.status = 'offline'
           }
+          if (bot.status === 'offline' || bot.status === 'disconnect') {
+            return
+          }
           _retryCount++
           bot.status = 'reconnect'
           this.timeout = setTimeout(() => polling(), retryInterval)

diff --git a/packages/core/src/bot.ts b/packages/core/src/bot.ts
@@ -94,6 +94,7 @@ export abstract class Bot<T extends Bot.Config = Bot.Config> {
       await this.adapter?.stop(this)
     } catch (error) {
       this.context.emit('internal/warning', error)
+    } finally {
       this.offline()
     }
   }