Replace sendAll with promiseEach

Author: josephfrazier

lib/facebook/reply.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const rp = require('minimal-request-promise'),
+  promiseEach = require('../promise-each'),
   breakText = require('../breaktext');
 
 module.exports = function fbReply(recipient, message, fbAccessToken) {
@@ -30,13 +31,6 @@ module.exports = function fbReply(recipient, message, fbAccessToken) {
       };
       return rp.post(`https://graph.facebook.com/v2.6/me/messages?access_token=${fbAccessToken}`, options);
     },
-    sendAll = function () {
-      if (!messages.length) {
-        return Promise.resolve();
-      } else {
-        return sendSingle(messages.shift()).then(sendAll);
-      }
-    },
     messages = [];
 
   function breakTextAndReturnFormatted(message) {
@@ -58,5 +52,5 @@ module.exports = function fbReply(recipient, message, fbAccessToken) {
   } else {
     messages = [message];
   }
-  return sendAll();
+  return promiseEach(sendSingle)(messages);
 };

lib/telegram/reply.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const rp = require('minimal-request-promise');
+const promiseEach = require('../promise-each');
 const REQUEST_THROTTLE = 1000/30;
 const RETRIABLE_ERRORS = ['ECONNRESET', 'ENOTFOUND', 'ESOCKETTIMEDOUT', 'ETIMEDOUT', 'ECONNREFUSED', 'EHOSTUNREACH', 'EPIPE', 'EAI_AGAIN'];
 const NUMBER_OF_RETRIES = 20;
@@ -59,26 +60,13 @@ module.exports = function tlReply(messageObject, message, tlAccessToken) {
       };
 
       return sendHttpRequest(tlAccessToken, method, options, numberOfRetries);
-    },
-
-    sendAll = function () {
-      if (!messages.length) {
-        return Promise.resolve();
-      } else {
-        return sendSingle(messages.shift())
-        .then(() => {
-          return new Promise((resolve) => {
-            if (!messages.length)
-              resolve();
-            else
-              setTimeout(resolve, REQUEST_THROTTLE);
-          });
-        })
-        .then(sendAll);
-      }
-    },
-
-    messages = Array.isArray(message) ? message : [message];
+    };
 
-  return sendAll();
+  return promiseEach(m =>
+    sendSingle(m).then(() =>
+      new Promise(resolve =>
+        setTimeout(resolve, REQUEST_THROTTLE)
+      )
+    )
+  )(message);
 };

lib/viber/reply.js

@@ -1,5 +1,6 @@
 'use strict';
 const rp = require('minimal-request-promise');
+const promiseEach = require('../promise-each');
 
 function sendSingle(receiver, authToken, messageObj) {
   let message;
@@ -30,20 +31,8 @@ function sendSingle(receiver, authToken, messageObj) {
   return rp.post('https://chatapi.viber.com/pa/send_message', options);
 }
 
-function sendAll(receiver, authToken, messages) {
-  if (!messages.length) {
-    return Promise.resolve();
-  } else {
-    return sendSingle(receiver, authToken, messages.shift())
-      .then(() => sendAll(receiver, authToken, messages));
-  }
-}
-
 function sendReply(receiver, messages, authToken) {
-  if (!Array.isArray(messages))
-    messages = [messages];
-
-  return sendAll(receiver, authToken, messages);
+  return promiseEach(m => sendSingle(receiver, authToken, m))(messages);
 }
 
 module.exports = sendReply;