Fix: Wrap callback call in try/catch and rethrow async (fixes #45)

gulpjs · Jan 15, 2018 · e54c104 · e54c104
1 parent ad873f2
commit e54c104
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -11,6 +11,22 @@ var eosConfig = {
   error: false,
 };
 
+function rethrowAsync(err) {
+  process.nextTick(rethrow);
+
+  function rethrow() {
+    throw err;
+  }
+}
+
+function tryCatch(fn, args) {
+  try {
+    return fn.apply(null, args);
+  } catch (err) {
+    rethrowAsync(err);
+  }
+}
+
 function asyncDone(fn, cb) {
   cb = once(cb);
 
@@ -21,18 +37,18 @@ function asyncDone(fn, cb) {
   function done() {
     d.removeListener('error', onError);
     d.exit();
-    return cb.apply(null, arguments);
+    return tryCatch(cb, arguments);
   }
 
   function onSuccess(result) {
-    tick(done, null, result);
+    done(null, result);
   }
 
   function onError(error) {
     if (!error) {
       error = new Error('Promise rejected without Error');
     }
-    tick(done, error);
+    done(error);
   }
 
   function asyncRunner() {

diff --git a/test/promises.js b/test/promises.js
@@ -48,6 +48,7 @@ describe('promises', function() {
     var d = domain.create();
     d.once('error', function(err) {
       expect(err).toExist();
+      expect(err.message).toContain('Boom');
       done();
     });
     d.run(function() {