Enhanced hub

vishr · vishr · commit e41a5af6225a · 2018-06-02T14:45:26.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/labstack/hub.py b/labstack/hub.py
@@ -2,37 +2,47 @@
 import paho.mqtt.client as mqtt
 
 class Hub():
-  def __init__(self, account_id, api_key, client_id=None):
+  def __init__(self, account_id, api_key, device_id=None, message_handler=None):
     self.account_id = account_id
-    self.client = mqtt.Client(client_id=client_id, clean_session=True)
+    self.client = mqtt.Client(client_id=device_id, clean_session=True)
     self.client.username_pw_set(account_id, api_key)
     # self.client.tls_set(ca_certs='labstack.com/cert.pem')
     self.handlers = {}
     def handler(client, userdata, msg):
-      self.handlers[msg.topic](msg.payload)
+      topic = self._denormalize_topic(msg.topic)
+      if message_handler:
+        message_handler(topic, msg.payload)
+      h = self.handlers.get(topic)
+      if h:
+        h(topic, msg.payload)
     self.client.on_message = handler
+
+  def _normalize_topic(self, topic):
+    return '{}/{}'.format(self.account_id, topic)
+  
+  def _denormalize_topic(self, topic):
+    return topic.lstrip(self.account_id + '/')
   
   def connect(self, handler=None):
     self.client.connect("hub.labstack.com", 1883)
     self.client.loop_start()
     def on_connect(client, userdata, flags, rc):
-      if handler is not None:
+      if handler:
         handler()
     self.client.on_connect = on_connect
 
   def publish(self, topic, message):
-    self.client.publish('{}/{}'.format(self.account_id, topic), message)
+    self.client.publish(self._normalize_topic(topic), message)
 
   # def subscribe(self, topic, handler, shared=False):
-  def subscribe(self, topic, handler):
-    topic = '{}/{}'.format(self.account_id, topic)
+  def subscribe(self, topic, handler=None):
     # if shared:
     #   topic = '$queue/' + topic
-    self.client.subscribe(topic)
+    self.client.subscribe(self._normalize_topic(topic))
     self.handlers[topic] = handler
 
   def unsubscribe(self, topic):
-    self.client.unsubscribe('{}/{}'.format(self.account_id, topic))
+    self.client.unsubscribe(self._normalize_topic(topic))
 
   def disconnect(self):
     self.client.loop_stop()
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
   name='labstack',
-  version='0.31.6',
+  version='0.32.0',
   description='Official Python client library for the LabStack platform',
   long_description='`<https://github.com/labstack/labstack-python>`_',
   keywords='image compress, image resize, text summary, barcode generate, barcode scan',
