Merge pull request #12 from node-modules/tweak-promise

Tweak callback throw error

Author: xudafeng

HISTORY.md

@@ -1,3 +1,8 @@
+# 1.0.7 / 2016-12-11
+
+  * Early return for rejected promise
+  * Prevent promsie swallow in callback
+
 # 1.0.6 / 2016-11-29
 
   * Bump version for new Repo

lib/detect-port.js

@@ -7,13 +7,13 @@ module.exports = function() {
 
   const promise = new Promise((resolve, reject) => {
     if (!args.length) {
-      reject('wrong number of arguments');
+      return reject('wrong number of arguments');
     }
 
     const port = parseInt(args[0], 10);
 
     if (isNaN(port)) {
-      reject(`wrong type of arguments with: '${args[0]}'`);
+      return reject(`wrong type of arguments with: '${args[0]}'`);
     }
 
     const loop = port => {
@@ -63,9 +63,9 @@ module.exports = function() {
     const cb = args[1];
 
     promise.then(data => {
-      cb.call(this, null, data);
-    }).catch(err => {
-      cb.call(this, err);
+      process.nextTick(cb.bind(null, null, data));
+    }, err => {
+      process.nextTick(cb.bind(null, err));
     });
   } else {
     return promise;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "detect-port",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "detect available port",
   "keywords": [
     "detect",