Update: Use end-of-stream module to handle all stream completion

Author: phated

index.js

@@ -3,6 +3,8 @@
 var domain = require('domain');
 var EE = require('events').EventEmitter;
 
+var eos = require('end-of-stream');
+
 function asyncDone(fn, done){
   function onSuccess(result){
     return done(undefined, result);
@@ -21,7 +23,7 @@ function asyncDone(fn, done){
 
     if(result && result instanceof EE){
       d.add(result);
-      result.once('end', onSuccess).once('close', onSuccess);
+      eos(result, { error: false }, onSuccess);
       return;
     }
 

package.json

@@ -19,6 +19,9 @@
     "url": "https://github.com/phated/async-done/issues"
   },
   "homepage": "https://github.com/phated/async-done",
+  "dependencies": {
+    "end-of-stream": "^0.1.4"
+  },
   "devDependencies": {
     "tap": "~0.4.8",
     "through2": "~0.4.1",

test/streams.js

@@ -30,9 +30,8 @@ function failure(){
 }
 
 test('handle a successful stream', function(t){
-  asyncDone(success, function(err, result){
+  asyncDone(success, function(err){
     t.ok(err == null, 'error should be null or undefined');
-    t.equal(result, 2, 'result should be 2');
     t.end();
   });
 });