support clientId

Author: 256dpi

src/YunMQTTClient.cpp

@@ -24,6 +24,8 @@ boolean YunMQTTClient::connect(const char * clientId, const char * username, con
   this->process.print(this->hostname);
   this->process.print(':');
   this->process.print(this->port);
+  this->process.print(':');
+  this->process.print(clientId);
   if(strlen(username) > 0 && strlen(password) > 0) {
     this->process.print(':');
     this->process.print(username);

yun/abi.md

@@ -4,7 +4,7 @@
 
 Command | Description | Format
 ---|---|---
-→ | connect | `c:(host):(port):(user):(pass)`
+→ | connect | `c:(host):(port):(id):(user):(pass)`
 ← | connection approved | `ca`
 ← | connection denied | `cd`
 → | subscribe | `s:(topic)`
@@ -16,4 +16,3 @@ Command | Description | Format
 Todo:
 
 - length prefix data (may contain `:`)
-- add client id

yun/client.py

@@ -1,71 +1,70 @@
 import sys
 import paho.mqtt.client as mqtt
 
-# Client Callbacks
-
-def on_connect(_, __, ___, rc):
-    if rc == 0:
-        send_command("ca")
-    else:
-        send_command("cd")
-
-def on_message(_, __, msg):
-    send_command("m:" + msg.topic + ":" + str(msg.payload))
-
-# Command Helpers
-
-def parse_command(client, line):
-    segments = line.split(":")
-    cmd = segments[0]
-    remaining = segments[1:]
-    if cmd == 'c':
-        do_connect(client, remaining)
-    elif cmd == 's':
-        do_subscribe(client, remaining)
-    elif cmd == 'u':
-        do_unsubscribe(client, remaining)
-    elif cmd == 'p':
-        do_publish(client, remaining)
-    elif cmd == 'd':
-        do_disconnect(client)
-
-def send_command(line):
-    sys.stdout.write(line + "\n")
-
-# Command Handlers
-
-def do_connect(client, args):
-    if len(args) >= 4:
-        client.username_pw_set(args[2], args[3])
-    if len(args) >= 2:
-        client.connect(args[0], int(args[1]))
-        client.loop_start()
-
-def do_subscribe(client, args):
-    if len(args) >= 1:
-        client.subscribe(args[0])
-
-def do_unsubscribe(client, args):
-    if len(args) >= 1:
-        client.unsubscribe(args[0])
-
-def do_publish(client, args):
-    if len(args) >= 2:
-        client.publish(args[0], args[1])
-
-def do_disconnect(client):
-    client.disconnect()
-    client.loop_stop()
+class Client:
+    # Constructor
+    def __init__(self):
+        self.client = None
+
+    # Client Callbacks
+    def on_connect(self, _, __, ___, rc):
+        if rc == 0:
+            self.send_command("ca")
+        else:
+            self.send_command("cd")
+    def on_message(self, _, __, msg):
+        self.send_command("m:" + msg.topic + ":" + str(msg.payload))
+
+    # Command Helpers
+    def parse_command(self, line):
+        segments = line.split(":")
+        cmd = segments[0]
+        remaining = segments[1:]
+        if cmd == 'c':
+            self.do_connect(remaining)
+        elif cmd == 's':
+            self.do_subscribe(remaining)
+        elif cmd == 'u':
+            self.do_unsubscribe(remaining)
+        elif cmd == 'p':
+            self.do_publish(remaining)
+        elif cmd == 'd':
+            self.do_disconnect()
+    def send_command(self, line):
+        sys.stdout.write(line + "\n")
+
+    # Command Handlers
+    def do_connect(self, args):
+        if len(args) >= 3:
+            self.client = mqtt.Client(args[2])
+            self.client.on_connect = self.on_connect
+            self.client.on_message = self.on_message
+            if len(args) >= 5:
+                self.client.username_pw_set(args[3], args[4])
+            self.client.connect(args[0], int(args[1]))
+            self.client.loop_start()
+    def do_subscribe(self, args):
+        if len(args) >= 1:
+            self.client.subscribe(args[0])
+    def do_unsubscribe(self, args):
+        if len(args) >= 1:
+            self.client.unsubscribe(args[0])
+    def do_publish(self, args):
+        if len(args) >= 2:
+            self.client.publish(args[0], args[1])
+    def do_disconnect(self):
+        self.client.disconnect()
+        self.client.loop_stop()
+
+    # Main
+    def run(self):
+        c.send_command("ok")
+        while True:
+            self.parse_command(sys.stdin.readline()[0:-1])
 
 # Main Loop
 
-c = mqtt.Client()
-c.on_connect = on_connect
-c.on_message = on_message
-
-send_command("ok")
-
-while True:
-    parse_command(c, sys.stdin.readline()[0:-1])
+c = Client()
+c.run()
 
 # TODO: better error handling