🐛 Fix #37 - use proper callback arrays for listeners

Make sure we always set and clean up 'sent' listeners

lib/Request.js

@@ -32,20 +32,19 @@ function RequestType (masterOptions) {
   }
 
   requestType.data = function onData (callback) {
-    requestType._emitter.on('data', callback)
+    requestType._dataCallbacks.push(callback)
 
     return requestType
   }
 
   requestType.sent = function onSent (callback) {
-    // requestType._emitter.on('sent', callback)
     requestType._sentCallbacks.push(callback)
 
     return requestType
   }
 
   requestType.timeout = function onTimeout (callback) {
-    requestType._emitter.on('timeout', callback)
+    requestType._timeoutCallbacks.push(callback)
 
     return requestType
   }
@@ -222,10 +221,9 @@ function Request (base, type, options) {
         if (type.options.expectReply) {
           request._emitter.removeAllListeners(`data-${messageId}`)
           request._emitter.removeAllListeners(`timeout-${messageId}`)
-        } else {
-          request._emitter.removeAllListeners(`sent-${messageId}`)
         }
 
+        request._emitter.removeAllListeners(`sent-${messageId}`)
         request._emitter.removeAllListeners(`error-${messageId}`)
 
         if (err) return reject((err && err.message) || err)
@@ -250,14 +248,15 @@ function Request (base, type, options) {
         })
       } else {
         request._emitter.once(`sent-${messageId}`, a => cleanUp(null, a))
-        type._sentCallbacks.forEach((callback) => {
-          request._emitter.once(`sent-${messageId}`, callback)
-        })
-        request._sentCallbacks.forEach((callback) => {
-          request._emitter.once(`sent-${messageId}`, callback)
-        })
       }
 
+      type._sentCallbacks.forEach((callback) => {
+        request._emitter.once(`sent-${messageId}`, callback)
+      })
+      request._sentCallbacks.forEach((callback) => {
+        request._emitter.once(`sent-${messageId}`, callback)
+      })
+
       request._emitter.on(`error-${messageId}`, cleanUp)
     })
   }