Added compatibility with me-no-dev/ESPAsyncTCP@^1.2.2

README.md

@@ -24,6 +24,7 @@ TinyMqtt is a small, fast and capable Mqtt Broker and Client for Esp8266 / Esp32
 
 ## Features
 
+- Async Wifi compatible (me-no-dev/ESPAsyncTCP@^1.2.2)
 - Very fast broker I saw it re-sent 1000 topics per second for two
   clients that had subscribed (payload ~15 bytes ESP8266). No topic lost.
   The max I've seen was 2k msg/s (1 client 1 subscription)

bump_version.sh

@@ -1,16 +1,17 @@
 #!/bin/bash
 current_version=$(git describe --tags --abbrev=0)
-cp library.json.skeleton library.json
-while ifs= read -r line; do
-  name=$(echo "$line" | sed "s/=.*//g")
-  value=$(echo "$line" | cut -d= -f 2 | sed 's/"//g')
-  sed -i "s/#$name/$value/g" library.json
-done < library.properties
-
+if [ "$1" == "-d" ]; then
+  do=0
+  shift
+else
+  do=1
+fi
 if [ "$1" == "" ]; then
 	echo
-	echo "Syntax: $0 {new_version}"
+	echo "Syntax: $0 [-d] {new_version}"
 	echo
+	echo "  -d : dry run, generate json and update properties but do not run git commands"
+	echo ""
 	echo "  Current version: $current_version"
 	echo
 else
@@ -23,15 +24,35 @@ else
 		grep $current_version library.properties
 		if [ "$?" == "0" ]; then
 			sed -i "s/$current_version/$1/" library.properties
-			if [ 0 == 1 ]; then
+
+      cp library.json.skeleton library.json
+      while ifs= read -r line; do
+        name=$(echo "$line" | sed "s/=.*//g")
+        value=$(echo "$line" | cut -d= -f 2 | sed 's/"//g')
+        echo "  Replacing $name in json"
+        if [ "$name" == "depends" ]; then
+          depends=$(echo "$value" | sed "s/,/ /g")
+          echo "  Depends=$depends"
+        fi
+        echo "  " sed -i "s@#$name@$value@g" library.json
+        sed -i "s@#$name@$value@g" library.json
+      done < library.properties
+      deps=""
+      for depend in $depends; do
+        if [ "$deps" != "" ]; then
+          deps="$deps, "
+        fi
+        deps="$deps'$depend' : '*'"
+      done
+      sed -i "s@#dependencies@$deps@g" library.json
+      sed -i "s/'/\"/g" library.json
+      if [ "$do" == "1" ]; then
         git tag $1
         git add library.properties
         git add library.json
         git commit -m "Release $1"
         git push
         git push --tags
-      else
-        echo "No git operation made"
       fi
 		else
 			echo "Current version does not match library.property version, aborting"

examples/tinymqtt-test/tinymqtt-test.ino

@@ -15,8 +15,6 @@
 #include <string>
 #include <map>
 
-using string = TinyString;
-
 bool echo_on = true;
 auto green = TinyConsole::green;
 auto red = TinyConsole::red;
@@ -28,8 +26,11 @@ auto save_cursor = TinyConsole::save_cursor;
 auto restore_cursor = TinyConsole::restore_cursor;
 auto erase_to_end = TinyConsole::erase_to_end;
 
-const char* ssid = "";
-const char* password = "";
+const char *ssid = "Freebox-786A2F";
+const char *password = "usurpavi8dalum64lumine?";
+
+void onCommand(const string &command);
+void eval(string &cmd);
 
 struct free_broker
 {
@@ -43,8 +44,7 @@ struct free_broker
 const std::map<string, free_broker> list =
     {
         {"mqtthq", {"public.mqtthq.com", 8083, "publish/subscribe"}},
-  { "hivemq", { "broker.hivemq.com", 1883, "" }}
-};
+        {"hivemq", {"broker.hivemq.com", 1883, ""}}};
 
 /** Very complex example
  * Console allowing to make any kind of test,
@@ -88,7 +88,8 @@ void setup()
   delay(500);
 
   Console.cls();
-  Console << endl << endl;
+  Console << endl
+          << endl;
   Console << yellow
           << "***************************************************************" << endl;
   Console << "*  Welcome to the TinyMqtt console" << endl;
@@ -99,7 +100,8 @@ void setup()
   if (strlen(ssid) == 0)
     Console << red << "*  ERROR: You must modify ssid/password in order" << endl
             << "          to be able to connect to your Wifi network." << endl;
-  Console << endl << white;
+  Console << endl
+          << white;
 
   Console << "Connecting to '" << ssid << "' ";
 
@@ -109,9 +111,13 @@ void setup()
   WiFi.begin(ssid, password);
 
   while (WiFi.status() != WL_CONNECTED)
-  { Console << '-'; delay(500); }
+  {
+    Console << '-';
+    delay(500);
+  }
 
-  Console << endl << "Connected to " << ssid << "IP address: " << WiFi.localIP() << endl;
+  Console << endl
+          << "Connected to " << ssid << "IP address: " << WiFi.localIP() << endl;
 
   const char *name = "tinytest";
   Console << "Starting MDNS, name= " << name;
@@ -120,12 +126,14 @@ void setup()
   else
     Console << " ok." << endl;
 
-
   MqttBroker *broker = new MqttBroker(1883);
   broker->begin();
   brokers["broker"] = broker;
 
-  if (Console.isTerm()) onCommand("every 333 view");
+  if (Console.isTerm())
+    onCommand("every 333 view");
+
+  Console.prompt();
 }
 
 string getword(string &str, const char *if_empty = nullptr, char sep = ' ');
@@ -137,8 +145,10 @@ int getint(string& str, const int if_empty=0)
   if (sword[0] and isdigit(sword[0]))
   {
     int ret = atoi(sword.c_str());
-    while(isdigit(sword[0]) or sword[0]==' ') sword.erase(0,1);
-    if (sword.length()) str = sword+' '+str;
+    while (isdigit(sword[0]) or sword[0] == ' ')
+      sword.erase(0, 1);
+    if (sword.length())
+      str = sword + ' ' + str;
     return ret;
   }
   str = str2;
@@ -148,7 +158,8 @@ int getint(string& str, const int if_empty=0)
 string getword(string &str, const char *if_empty /*=nullptr*/, char sep /*=' '*/)
 {
   char quote = (str[0] == '"' or str[0] == '\'' ? str[0] : 0);
-  if (quote) str.erase(0,1);
+  if (quote)
+    str.erase(0, 1);
   string sword;
   while (str.length() and (str[0] != sep or quote))
   {
@@ -160,8 +171,10 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
     sword += str[0];
     str.erase(0, 1);
   }
-  while(str[0]==sep) str.erase(0,1);
-  if (if_empty and sword.length()==0) return if_empty;
+  while (str[0] == sep)
+    str.erase(0, 1);
+  if (if_empty and sword.length() == 0)
+    return if_empty;
   if (quote == false and sword.length() >= 4 and sword.substr(0, 3) == "rnd")
   {
     sword.erase(0, 3);
@@ -174,7 +187,8 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
       {
         sword.erase(0, 1);
         to = getint(sword);
-        if (sword[0]!=')') Console << "Missing ')'" << endl;
+        if (sword[0] != ')')
+          Console << "Missing ')'" << endl;
       }
       else
       {
@@ -188,15 +202,18 @@ string getword(string& str, const char* if_empty/*=nullptr*/, char sep/*=' '*/)
       Console << "Missing '('" << endl;
     }
   }
-  while(str[0]==' ') str.erase(0,1);
+  while (str[0] == ' ')
+    str.erase(0, 1);
   return sword;
 }
 
 bool isaddr(string s)
 {
-  if (s.length()==0 or s.length()>3) return false;
+  if (s.length() == 0 or s.length() > 3)
+    return false;
   for (char c : s)
-    if (c<'0' or c>'9') return false;
+    if (c < '0' or c > '9')
+      return false;
   return true;
 }
 
@@ -225,7 +242,8 @@ string getip(string& str, const char* if_empty=nullptr, char sep=' ')
   }
   for (string s : build)
   {
-    if (addr.length()) addr += '.';
+    if (addr.length())
+      addr += '.';
     addr += s;
   }
   Console << "connect address: " << addr << endl;
@@ -238,20 +256,22 @@ std::set<string> commands = {
     "broker", "blink", "client", "connect",
     "create", "delete", "debug", "help", "interval",
     "list", "ls", "ip", "off", "on", "set",
-  "publish", "reset", "subscribe", "unsubscribe", "view", "echo", "every"
-};
+    "publish", "reset", "subscribe", "unsubscribe", "view", "echo", "every"};
 
 void convertToCommand(string &search)
 {
-  while(search[0]==' ') search.erase(0,1);
-  if (search.length()==0) return;
+  while (search[0] == ' ')
+    search.erase(0, 1);
+  if (search.length() == 0)
+    return;
   string matches;
   int count = 0;
   for (string cmd : commands)
   {
     if (cmd.substr(0, search.length()) == search)
     {
-      if (count) matches +=", ";
+      if (count)
+        matches += ", ";
       count++;
       matches += cmd;
     }
@@ -295,7 +315,6 @@ void replaceVars(string& cmd)
   }
   cmd.erase(0, cmd.find_first_not_of(' '));
   cmd.erase(cmd.find_last_not_of(' ') + 1);
-
 }
 
 bool compare(string s, const char *cmd)
@@ -303,8 +322,10 @@ bool compare(string s, const char* cmd)
   uint8_t p = 0;
   while (s[p++] == *cmd++)
   {
-    if (*cmd==0 or s[p]==0) return true;
-    if (s[p]==' ') return true;
+    if (*cmd == 0 or s[p] == 0)
+      return true;
+    if (s[p] == ' ')
+      return true;
   }
   return false;
 }
@@ -347,10 +368,10 @@ void onCommand(const string& command)
 {
   Console << endl;
   string cmd = command;
-  if (cmd.substr(0,3)!="set") replaceVars(cmd);
+  if (cmd.substr(0, 3) != "set")
+    replaceVars(cmd);
   eval(cmd);
   Console << endl;
-  Console.prompt();
 }
 
 void clientConnect(MqttClient *client, string &cmd)
@@ -406,9 +427,11 @@ void eval(string& cmd)
     }
 
     s = getword(cmd);
-    if (s.length()) convertToCommand(s);
+    if (s.length())
+      convertToCommand(s);
     if (s.length() == 0)
-    {}
+    {
+    }
     else if (compare(s, "debug"))
     {
 #if TINY_MQTT_DEBUG
@@ -445,7 +468,8 @@ void eval(string& cmd)
       {
         for (auto it : clients)
         {
-          if (it.second != client) continue;
+          if (it.second != client)
+            continue;
           Console << "deleted" << endl;
           delete (it.second);
           clients.erase(it.first);
@@ -457,7 +481,8 @@ void eval(string& cmd)
       {
         for (auto it : brokers)
         {
-          if (broker != it.second) continue;
+          if (broker != it.second)
+            continue;
           Console << "deleted" << endl;
           delete (it.second);
           brokers.erase(it.first);
@@ -677,7 +702,8 @@ void eval(string& cmd)
         if (s == "" or brokers.find(s) != brokers.end() or list.find(s) != list.end())
         {
           MqttBroker *broker = nullptr;
-          if (s.length()) broker = brokers[s];
+          if (s.length())
+            broker = brokers[s];
           MqttClient *client = new MqttClient(broker, id);
           clients[id] = client;
           client->setCallback(onPublish);
@@ -790,7 +816,8 @@ void eval(string& cmd)
     }
     else
     {
-      while(s[0]==' ') s.erase(0,1);
+      while (s[0] == ' ')
+        s.erase(0, 1);
       if (s.length())
         Console << "Unknown command (" << s.c_str() << ")" << endl;
     }
@@ -811,7 +838,8 @@ void loop()
 
   for (auto &every : everies)
   {
-    if (not every.active) continue;
+    if (not every.active)
+      continue;
     if (every.ms && every.cmd.length() && ms > every.next)
     {
       string cmd(every.cmd);
@@ -821,6 +849,7 @@ void loop()
       {
         every.next += every.ms;
         Console << yellow << "Underrun every #" << e << ", " << (ms - every.next) << "ms late" << endl;
+        Console.fg(white);
         every.underrun = ms + 5000;
       }
     }

library.json

@@ -6,7 +6,9 @@
         "type": "git",
         "url": "https://github.com/hsaturn/TinyMqtt.git"
     },
-    "version": "0.9.15",
+    "dependencies":
+    { "hsaturn/TinyConsole" : "*" },
+    "version": "0.9.18",
     "exclude": "",
     "examples": "examples/*/*.ino",
     "frameworks": "arduino",

library.json.skeleton

@@ -6,6 +6,8 @@
         "type": "git",
         "url": "https://github.com/hsaturn/TinyMqtt.git"
     },
+    "dependencies":
+    { #dependencies },
     "version": "#version",
     "exclude": "",
     "examples": "examples/*/*.ino",

library.properties

@@ -1,5 +1,5 @@
 name=TinyMqtt
-version=0.9.16
+version=0.9.18
 author=Francois BIOT, HSaturn, <hsaturn@gmail.com>
 maintainer=Francois BIOT <hsaturn@gmail.com>
 sentence=A tiny broker and client library for MQTT messaging.
@@ -7,5 +7,5 @@ paragraph=MQTT is a lightweight messaging protocol. This library allows to host
 category=Communication
 url=https://github.com/hsaturn/TinyMqtt
 architectures=*
-depends=TinyConsole
+depends=hsaturn/TinyConsole
 includes=TinyMqtt.h

src/TinyMqtt.cpp

@@ -116,7 +116,7 @@ void MqttClient::connect(string broker, uint16_t port, uint16_t ka)
 #ifdef TINY_MQTT_ASYNC
   tcp_client->onData(onData, this);
   tcp_client->onConnect(onConnect, this);
-  tcp_client->connect(broker.c_str(), port, ka);
+  tcp_client->connect(broker.c_str(), port);
 #else
   if (tcp_client->connect(broker.c_str(), port))
   {