Merge pull request #40 from laurynas-karvelis/master

Don't merge yet: Keep on listening to Telegram's updates even if requests with telegram server fail

src/functions/poll.js

@@ -1,13 +1,18 @@
 export default function poll(bot) {
-  return bot.api.getUpdates(bot.update).then(response => {
+  return bot.api.getUpdates(bot.update)
-    if (!response.result.length) {
+      .then(response => {
-      return poll(bot);
+        if (!response.result.length) {
-    }
+          return poll(bot);
-    bot.emit('update', response.result);
+        }
+        bot.emit('update', response.result);
 
-    if (bot._stop) {
+        if (bot._stop) {
-      return null;
+          return null;
-    }
+        }
-    return poll(bot);
+        return poll(bot);
-  });
+      })
+      .catch(e => {
+        bot.emit('error', e);
+        return poll(bot);
+      });
 }

src/index.js

@@ -75,17 +75,22 @@ export default class Bot extends EventEmitter {
     if (hook) {
       return webhook(hook, this);
     }
-    return this.api.getMe().then(response => {
+    return this.api.getMe()
-      this.info = response.result;
+      .then(response => {
+        this.info = response.result;
 
-      this.on('update', this._update);
+        this.on('update', this._update);
 
-      if (hook) {
+        if (hook) {
-        return webhook(hook, this);
+          return webhook(hook, this);
-      }
+        }
 
-      return poll(this);
+        return poll(this);
-    });
+      })
+      .catch(e => {
+        this.emit('error', e);
+        throw e;
+      });
   }
 
   /**
@@ -138,7 +143,11 @@ export default class Bot extends EventEmitter {
    * @return {unknown} returns the result of calling message's send method
    */
   send(message) {
-    return message.send(this);
+    return message.send(this)
+      .catch(e => {
+        this.emit('error', e);
+        throw e;
+      });
   }
 
   /**