Merge pull request #14 from msgflo/mqtt-modernize

mqtt: Fix mqtt>1.4.x

Author: jonnor

package.json

@@ -30,7 +30,7 @@
     "grunt-mocha-test": "^0.12.2",
     "grunt-shell-spawn": "^0.3.1",
     "mocha": "~1.21.0",
-    "mqtt": "1.4.x"
+    "mqtt": "^1.4.0"
   },
   "keywords": [],
   "bin": {

src/mqtt.coffee

@@ -19,17 +19,27 @@ class Client extends interfaces.MessagingClient
       return callback mqtt
 
     @client = mqtt.connect @address
-    @client.on 'error', (err) =>
-      debug 'error', err
+
+    # debug
     @client.on 'reconnect', () =>
       debug 'reconnect'
     @client.on 'offline', () =>
       debug 'offline'
-    onConnected = (err) =>
+
+    @client.on 'error', (err) =>
+      debug 'error', err
+      if callback
+        callback err
+        callback = null
+        return
+    onConnected = (connack) =>
       debug 'connected'
       @client.on 'message', (topic, message) =>
         @_onMessage topic, message
-      return callback err
+      if callback
+        callback null
+        callback = null
+        return
     @client.once 'connect', onConnected
 
   disconnect: (callback) ->