defend against multiple callbacks

1 files changed, 19 insertions, 15 deletions

diff --git a/lib/waterfall.js b/lib/waterfall.js
index 8867c87..e25f629 100644
--- a/lib/waterfall.js
+++ b/lib/waterfall.js
@@ -5,28 +5,32 @@ import noop from 'lodash/noop';
 import once from 'lodash/once';
 import rest from 'lodash/rest';
 
-import ensureAsync from './ensureAsync';
-import iterator from './iterator';
+import onlyOnce from './internal/onlyOnce';
 
 export default  function(tasks, cb) {
     cb = once(cb || noop);
     if (!isArray(tasks)) return cb(new Error('First argument to waterfall must be an array of functions'));
     if (!tasks.length) return cb();
+    var taskIndex = 0;
 
-    function wrapIterator(iterator) {
-        return rest(function(err, args) {
+    function nextTask(args) {
+        if (taskIndex === tasks.length) {
+            return cb.apply(null, [null].concat(args));
+        }
+        var task = tasks[taskIndex];
+        taskIndex++;
+
+        var taskCallback = onlyOnce(rest(function(err, args) {
             if (err) {
-                cb.apply(null, [err].concat(args));
-            } else {
-                var next = iterator.next();
-                if (next) {
-                    args.push(wrapIterator(next));
-                } else {
-                    args.push(cb);
-                }
-                ensureAsync(iterator).apply(null, args);
+                return cb.apply(null, [err].concat(args));
             }
-        });
+            nextTask(args);
+        }));
+
+        args.push(taskCallback);
+
+        task.apply(null, args);
     }
-    wrapIterator(iterator(tasks))();
+
+    nextTask([]);
 }