Enhanced hub

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

lib/hub.js

@@ -1,10 +1,19 @@
 const mqtt = require('mqtt')
 
 class Hub {
-  constructor(accountID, apiKey, clientID) {
+  constructor(accountID, apiKey, options) {
     this.accountID = accountID
     this.apiKey = apiKey
     this.handlers = {}
+    this.options = options || {}
+  }
+
+  _normalizeTopic(topic) {
+    return `${this.accountID}/${topic}`
+  }
+
+  _denormalizeTopic(topic) {
+    return topic.replace(this.accountID + '/', '');
   }
 
   connect(handler) {
@@ -18,24 +27,30 @@ class Hub {
       }
     })
     this.client.on('message', (topic, message) => {
-      this.handlers[topic](message)
+      topic = this._denormalizeTopic(topic)
+      handler = this.handlers[topic]
+      if (this.options.messageHandler) {
+        this.options.messageHandler(topic, message)
+      }
+      if (handler) {
+        handler(topic, message)
+      }
     })
     // this.client.on('end', () => {
     // })
   }
 
   publish(topic, message) {
-    this.client.publish(`${this.accountID}/${topic}`, message)
+    this.client.publish(this._normalizeTopic(topic), message)
   }
 
   subscribe(topic, handler) {
-    topic = `${this.accountID}/${topic}`
-    this.client.subscribe(topic)
+    this.client.subscribe(this._normalizeTopic(topic))
     this.handlers[topic] = handler
   }
 
   unsubscribe(self, topic) {
-    this.client.unsubscribe(`${this.accountID}/${topic}`)  
+    this.client.unsubscribe(this._normalizeTopic(topic))  
   }
 
   disconnect(self) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "labstack",
-  "version": "0.31.8",
+  "version": "0.32.0",
   "description": "Official Node.js client library for the LabStack platform",
   "main": "index.js",
   "scripts": {