Merge f548fba into 927f189

index.js

@@ -9,6 +9,7 @@ License:      Unlicense (public domain, see LICENSE file)
 
 
 const httpreq = require ('httpreq');
+const promiseSupport = typeof Promise !== "undefined" && Promise.toString().indexOf("[native code]") !== -1;
 
 let config = {
   timeout: 5000,
@@ -65,12 +66,13 @@ function sortObjectByValues (obj) {
  */
 
 function processApiError (res, err, callback) {
+  const usePromise = promiseSupport && (!callback || typeof callback !== 'function');
   let error = new Error ('API error');
 
   error.statusCode = res.statusCode;
   error.body = res.body;
   error.error = err;
-  callback (error);
+  usePromise ? Promise.reject(error) : callback (error);
 }
 
 
@@ -86,17 +88,18 @@ function processApiError (res, err, callback) {
  */
 
 function processResponse (err, res, callback) {
+  const usePromise = promiseSupport && (!callback || typeof callback !== 'function');
   let data;
   let error;
 
   if (err) {
-    return callback (err);
+    return usePromise ? Promise.reject(err) : callback (err);
   }
 
   if (res.statusCode === 404) {
     error = new Error ('not found');
     error.statusCode = res.statusCode;
-    return callback (error);
+    return usePromise ? Promise.reject(error) : callback (error);
   }
 
   try {
@@ -105,7 +108,7 @@ function processResponse (err, res, callback) {
     return processApiError (res, e, callback);
   }
 
-  return callback (null, data);
+  return usePromise ? Promise.resolve(data) : callback (null, data);
 }
 
 

package.json

@@ -1,45 +1,45 @@
 {
-  "author": {
-    "name": "Franklin van de Meent",
-    "email": "fr@nkl.in",
-    "url": "https://frankl.in"
-  },
-  "name": "haveibeenpwned",
-  "description": "API methods for Have I been pwned (unofficial)",
-  "version": "1.1.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/fvdm/nodejs-haveibeenpwned.git"
-  },
-  "bugs": {
-    "url": "https://github.com/fvdm/nodejs-haveibeenpwned/issues"
-  },
-  "main": "index.js",
-  "files": [
-    "example.js"
-  ],
-  "dependencies": {
-    "httpreq": "^0.4.24"
-  },
-  "devDependencies": {
-    "dotest": "^2.3.0"
-  },
-  "engines": {
-    "node": ">=4.0.0"
-  },
-  "scripts": {
-    "test": "dotest"
-  },
-  "tonicExampleFilename": "example.js",
-  "keywords": [
-    "api",
-    "breach",
-    "infosec",
-    "hacking",
-    "haveibeenpwned",
-    "security",
-    "password",
-    "passwords"
-  ],
-  "license": "Unlicense"
+	"author": {
+		"name": "Franklin van de Meent",
+		"email": "fr@nkl.in",
+		"url": "https://frankl.in"
+	},
+	"name": "haveibeenpwned",
+	"description": "API methods for Have I been pwned (unofficial)",
+	"version": "1.1.0",
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/fvdm/nodejs-haveibeenpwned.git"
+	},
+	"bugs": {
+		"url": "https://github.com/fvdm/nodejs-haveibeenpwned/issues"
+	},
+	"main": "index.js",
+	"files": [
+		"example.js"
+	],
+	"dependencies": {
+		"httpreq": "^0.4.24"
+	},
+	"devDependencies": {
+		"dotest": "^2.3.0"
+	},
+	"engines": {
+		"node": ">=4.0.0"
+	},
+	"scripts": {
+		"test": "dotest"
+	},
+	"tonicExampleFilename": "example.js",
+	"keywords": [
+		"api",
+		"breach",
+		"infosec",
+		"hacking",
+		"haveibeenpwned",
+		"security",
+		"password",
+		"passwords"
+	],
+	"license": "Unlicense"
 }