Merge pull request #10 from NivEz/improve-long-polling

Improve long polling

README.md

@@ -76,6 +76,10 @@ If you prefer to use long polling method over creating a server with webhook you
 <br>
 The method accepts `pollingDelay` - a number that represents milliseconds (must be at least 50ms).
 <br>
+By default the long polling mechanism will ignore all previous updates (`cleanPreviousUpdates` by default is `true`). You can toggle off `cleanPreviousUpdates` if you want to by setting it as `false` when you call `startLongPolling`.
+<br>
+You also can stop the long polling while it's running by setting `bot.useLongPolling` to `false`.
+<br>
 You can view an example of long polling usage [here](https://github.com/NivEz/telenode/tree/main/examples/long-polling.js).
 
 Note that long polling is usually not recommended and webhook is preferred for most use cases.

examples/long-polling.js

@@ -27,3 +27,8 @@ const inlineKeyboard = [
  },
  ],
 ];
+
+// After 30 seconds the long polling will stop
+setTimeout(() => {
+ bot.useLongPolling = false;
+}, 30000);

src/bot.js

@@ -13,17 +13,23 @@ class Telenode {
  this.buttonHandlers = {};
  this.#baseUrl = 'https://api.telegram.org/bot' + apiToken;
  this.#secretToken = secretToken;
+ this.useLongPolling = false;
  }
 
  createServer({ port, unauthorizedCallback } = {}) {
  this.unauthorizedHandler = unauthorizedCallback;
+ if (this.useLongPolling) {
+ throw Error('Cannot start server while long polling is active');
+ }
  runServer(this, port);
  }
 
- startLongPolling({ pollingDelay } = {}) {
+ startLongPolling({ pollingDelay, cleanPreviousUpdates } = {}) {
+ this.useLongPolling = true;
  longPoll({
  bot: this,
  pollingDelay,
+ cleanPreviousUpdates,
  url: this.#baseUrl,
  });
  }

src/longPolling.js

@@ -1,16 +1,17 @@
 const axios = require('axios');
 
-const longPoll = async ({ bot, pollingDelay = 1000, url }) => {
+const longPoll = async ({ bot, pollingDelay = 1000, cleanPreviousUpdates = true, url }) => {
  if (pollingDelay < 50) {
  throw new Error('Polling delay must be at least 50ms');
  }
  let offset = 0;
- while (true) {
+ if (cleanPreviousUpdates) {
+ const recentUpdates = await getUpdates(url, -1);
+ offset = recentUpdates[0]?.update_id + 1 || 0;
+ }
+ while (bot.useLongPolling) {
  try {
- const res = await axios.get(url + '/getUpdates', {
- params: { offset },
- });
- const updates = res.data.result;
+ const updates = await getUpdates(url, offset);
  updates.forEach(update => {
  bot.telenodeHandler(update);
  offset = update.update_id + 1;
@@ -30,6 +31,14 @@ const longPoll = async ({ bot, pollingDelay = 1000, url }) => {
  }
  await sleep(pollingDelay);
  }
+ console.log('Long polling stopped...');
+};
+
+const getUpdates = async (url, offset) => {
+ const res = await axios.get(url + '/getUpdates', {
+ params: { offset },
+ });
+ return res.data.result;
 };
 
 module.exports = {