added disconnect and other stuff

Author: 256dpi

src/YunMQTTClient.cpp

@@ -89,14 +89,16 @@ void YunMQTTClient::loop() {
   if(av > 0) {
     String ret = process.readStringUntil('\n');
 
-    if(ret.charAt(0) == 'm') {
+    if(ret.startsWith("m")) {
       int startTopic = 2;
       int endTopic = ret.indexOf(':', startTopic + 1);
       int startPayload = endTopic + 1;
       int endPayload = ret.indexOf(':', startPayload + 1);
       String topic = ret.substring(startTopic, endTopic);
       String payload = ret.substring(startPayload, endPayload);
       messageReceived(topic, payload, (char*)payload.c_str(), payload.length());
+    } else if(ret.startsWith("e")) {
+      this->alive = false;
     }
   }
 }
@@ -106,5 +108,6 @@ boolean YunMQTTClient::connected() {
 }
 
 void YunMQTTClient::disconnect() {
-  //TODO: implement!
+  // send disconnect request
+  this->process.print("d\n");
 }

yun/abi.md

@@ -12,6 +12,7 @@ Command | Description | Format
 → | publish | `p:(topic):(data)`
 ← | message | `m:(topic):(data)`
 → | disconnect | `d`
+← | closed | `e`
 
 Todo:
 

yun/client.py

@@ -14,6 +14,9 @@ def on_connect(self, _, __, ___, rc):
             self.send_command("cd")
     def on_message(self, _, __, msg):
         self.send_command("m:" + msg.topic + ":" + str(msg.payload))
+    def on_disconnect(self):
+        self.client.loop_stop()
+        self.send_command("e")
 
     # Command Helpers
     def parse_command(self, line):
@@ -44,17 +47,17 @@ def do_connect(self, args):
             self.client.connect(args[0], int(args[1]))
             self.client.loop_start()
     def do_subscribe(self, args):
-        if len(args) >= 1:
+        if self.client and len(args) >= 1:
             self.client.subscribe(args[0])
     def do_unsubscribe(self, args):
-        if len(args) >= 1:
+        if self.client and len(args) >= 1:
             self.client.unsubscribe(args[0])
     def do_publish(self, args):
-        if len(args) >= 2:
+        if self.client and len(args) >= 2:
             self.client.publish(args[0], args[1])
     def do_disconnect(self):
-        self.client.disconnect()
-        self.client.loop_stop()
+        if self.client:
+            self.client.disconnect()
 
     # Main
     def run(self):