Merge pull request #11 from RyLeeHarrison/master

updated: docs, test, source

Author: RangerMauve

.eslintrc.json

@@ -1,9 +1,15 @@
 {
   "env": {
+    "es6": true,
     "browser": true,
     "node": true,
     "mocha": true
   },
+
+  "parserOptions": {
+    "ecmaVersion": 2017
+  },
+
   "rules": {
     "quotes": [
       1,
@@ -21,7 +27,9 @@
     "indent": [
       2,
       2,
-      {"SwitchCase": 1}
+      {
+        "SwitchCase": 1
+      }
     ],
     "brace-style": [
       2,
@@ -46,8 +54,10 @@
       "always"
     ],
     "keyword-spacing": [
-        2,
-        {"after": true}
+      2,
+      {
+        "after": true
+      }
     ],
     "space-before-blocks": 2,
     "spaced-comment": [
@@ -59,9 +69,9 @@
         ],
         "markers": [
           "eslint",
-	  "jshint",
+          "jshint",
           "global"
-         ]
+        ]
       }
     ],
     "strict": [
@@ -72,4 +82,4 @@
     "camelcase": 0,
     "new-cap": 0
   }
-}
+}

.gitignore

@@ -3,6 +3,8 @@ logs
 *.log
 npm-debug.log*
 
+*.lock
+
 # Runtime data
 pids
 *.pid

README.md

@@ -31,14 +31,13 @@ The API is the same as [MQTT.js](https://github.com/mqttjs/MQTT.js#api), except
 ## Example
 
 ```javascript
-var MQTT = require("async-mqtt");
+const MQTT = require("async-mqtt");
 
-var client = MQTT.connect("tcp://somehost.com:1883");
+const client = MQTT.connect("tcp://somehost.com:1883");
 
 // When passing async functions as event listeners, make sure to have a try catch block
-client.on("connect", doStuff);
 
-async function doStuff() {
+const doStuff = async () => {
 
 	console.log("Starting");
 	try {
@@ -53,18 +52,20 @@ async function doStuff() {
 		process.exit();
 	}
 }
+
+client.on("connect", doStuff);
 ```
 
 ## Wrapping existing client
 
 ```javascript
-var AsyncClient = require("async-mqtt").AsyncClient;
+const { AsyncClient } = require("async-mqtt");
 
-var client = getRegularMQTTClientFromSomewhere();
+const client = getRegularMQTTClientFromSomewhere();
 
-var asyncClient = new AsyncClient(client);
+const asyncClient = new AsyncClient(client);
 
-asyncClient.publish("foo/bar", "baz").then(function(){
+asyncClient.publish("foo/bar", "baz").then(() => {
 	console.log("We async now");
 	return asyncClient.end();
 });

index.js

@@ -1,89 +1,126 @@
-'use strict';
-var mqtt = require('mqtt');
-var inArray = require('in-array');
-
-var RegularClientPrototype = mqtt.MqttClient.prototype;
-
-var ASYNC_METHODS = ['publish',
-  'subscribe',
-  'unsubscribe',
-  'end'
-];
-
-var SYNC_METHODS = [
-  'addListener',
-  'emit',
-  'eventNames',
-  'getMaxListeners',
-  'listenerCount',
-  'listeners',
-  'off',
-  'on',
-  'once',
-  'prependListener',
-  'prependOnceListener',
-  'removeAllListeners',
-  'removeListener',
-  'setMaxListeners',
-  'rawListeners'
-];
+'use strict'
 
-module.exports = {
-  connect: connect,
-  AsyncClient: AsyncClient
-};
+const mqtt = require('mqtt');
 
-function connect (brokerURL, opts) {
-  var client = mqtt.connect(brokerURL, opts);
+const RegularClientPrototype = mqtt.MqttClient.prototype;
 
-  var asyncClient = new AsyncClient(client);
-
-  return asyncClient;
-}
-
-function AsyncClient (client) {
-  this._client = client;
-}
+class AsyncClient {
+  constructor (client) {
+    this._client = client;
+  }
 
-AsyncClient.prototype = {
   set handleMessage (newHandler) {
     this._client.handleMessage = newHandler;
-  },
+  }
+
   get handleMessage () {
     return this._client.handleMessage;
   }
-};
 
-ASYNC_METHODS.forEach(defineAsync);
-SYNC_METHODS.forEach(definePassthrough);
+  publish (...args) {
+    return new Promise((resolve, reject) => {
+      this._client.publish(...args, (err, result) => {
+        if (err) reject(err)
+        else resolve(result)
+      })
+    })
+  }
 
-function definePassthrough (name) {
-  AsyncClient.prototype[name] = function () {
-    var client = this._client;
-    return client[name].apply(client, arguments);
-  };
-}
+  subscribe (...args) {
+    return new Promise((resolve, reject) => {
+      this._client.subscribe(...args, (err, result) => {
+        if (err) reject(err)
+        else resolve(result)
+      })
+    })
+  }
 
-function defineAsync (name) {
-  AsyncClient.prototype[name] = function asyncMethod () {
-    var client = this._client;
-    var args = [];
-    var length = arguments.length;
-    var i = 0;
-    for (i; i < length; i++)
-      args.push(arguments[i]);
-
-    return new Promise(function (resolve, reject) {
-      args.push(makeCallback(resolve, reject));
-      client[name].apply(client, args);
-    });
-  };
-}
+  unsubscribe (...args) {
+    return new Promise((resolve, reject) => {
+      this._client.unsubscribe(...args, (err, result) => {
+        if (err) reject(err)
+        else resolve(result)
+      })
+    })
+  }
+
+  end (...args) {
+    return new Promise((resolve, reject) => {
+      this._client.end(...args, (err, result) => {
+        if (err) reject(err)
+        else resolve(result)
+      })
+    })
+  }
+
+  addListener (...args) {
+    return this._client.addListener(...args);
+  }
+
+  emit (...args) {
+    return this._client.emit(...args);
+  }
+
+  eventNames (...args) {
+    return this._client.eventNames(...args);
+  }
+
+  getMaxListeners (...args) {
+    return this._client.getMaxListeners(...args);
+  }
 
-function makeCallback (resolve, reject) {
-  return function (err, data) {
-    if (err)
-      reject(err);
-    else resolve(data);
-  };
+  listenerCount (...args) {
+    return this._client.listenerCount(...args);
+  }
+
+  listeners (...args) {
+    return this._client.listeners(...args);
+  }
+
+  off (...args) {
+    return this._client.off(...args);
+  }
+
+  on (...args) {
+    return this._client.on(...args);
+  }
+
+  once (...args) {
+    return this._client.once(...args);
+  }
+
+  prependListener (...args) {
+    return this._client.prependListener(...args);
+  }
+
+  prependOnceListener (...args) {
+    return this._client.prependOnceListener(...args);
+  }
+
+  removeAllListeners (...args) {
+    return this._client.removeAllListeners(...args);
+  }
+
+  removeListener (...args) {
+    return this._client.removeListener(...args);
+  }
+
+  setMaxListeners (...args) {
+    return this._client.setMaxListeners(...args);
+  }
+
+  rawListeners (...args) {
+    return this._client.rawListeners(...args);
+  }
 }
+
+
+module.exports = {
+  connect (brokerURL, opts) {
+    const client = mqtt.connect(brokerURL, opts);
+    const asyncClient = new AsyncClient(client);
+  
+    return asyncClient;
+  },
+  AsyncClient
+};

package.json

@@ -25,7 +25,6 @@
   },
   "homepage": "https://github.com/mqttjs/async-mqtt#readme",
   "dependencies": {
-    "in-array": "^0.1.2",
     "mqtt": "^2.3.1"
   },
   "devDependencies": {