Implement more client logic

SpiderMQTT.py

@@ -307,7 +307,9 @@ class SpiderMQTT:
   def __init__(self, broker: str, port: int = 1883, user: str = None, password: str = None,
                will_topic: str = None, will_payload = None, will_qos: int = 0, will_retain: bool = False):
 
+    self.connected = False
     self.subscriptions = {}
+    self.pendingMessages = []
 
     self.mqtt = mqtt.Client()
     self.mqtt.reconnect_delay_set(1, 1)
@@ -320,6 +322,7 @@ class SpiderMQTT:
 
     self.mqtt.on_log = self.onLog
     self.mqtt.on_message = self.onMessage
+    self.mqtt.on_publish = self.onPublish
     self.mqtt.on_connect = self.onConnect
     self.mqtt.on_subscribe = self.onSubscribe
     self.mqtt.on_disconnect = self.onDisconnect
@@ -327,6 +330,24 @@ class SpiderMQTT:
     self.mqtt.connect(broker, port)
     self.mqtt.loop_forever(retry_first_connection=True)
 
+  def isConnected(self):
+    return self.connected
+
+  def publish(self, topic, payload=None, qos=0, retain=False):
+    if type(payload) is str:
+      pl = message.encode('utf-8')
+    else:
+      pl = message
+
+    if self.isConnecteed():
+      self.mqtt.publish(topic, pl, qos, retain)
+    else:
+      msg = Message(topic, pl)
+      msg.qos = qos
+      msg.retain = retain
+
+      self.pendingMessages += [msg]
+
   def onMessage(self, _cl, _ud, msg):
     message = Message(msg.topic, msg.payload)
 
@@ -334,10 +355,17 @@ class SpiderMQTT:
       sub.onMessage(message)
 
   def onConnect(self, *ignored):
+    self.connected = False
+
     for sub in self.subscriptions.values():
       sub.onConnect()
 
+    for msg in self.pendingMessages.values():
+      msg.mid = self.mqtt.publish(msg.topic, msg.payload, msg.qos, msg.retain).mid
+
   def onDisconnect(self, *ignored):
+    self.connected = False
+
     for sub in self.subscriptions.values():
       sub.onDisconnect()
 
@@ -345,9 +373,21 @@ class SpiderMQTT:
     for sub in self.subscriptions.values():
       sub.onSubscribe(mid)
 
+  def onPublish(self, _cl, _ud, mid):
+    for msg in self.pendingMessages:
+      if msg.mid == mid:
+        self.pendingMessages.remove(msg)
+
   def onLog():
     pass
 
+  def removeCallback(self, callback):
+    for sub in self.subscriptions:
+      sub.removeCallback()
+
+      if sub.callbacks == {}:
+        self.mqtt.unsubscribe(sub.topic)
+        del self.subscriptions[sub.topic]