Fix message crackers (#30)

Wasn't handling JSON objects and "solo" numbers correctly.
pubnub · Mar 11, 2019 · 2c82ad8 · 2c82ad8
1 parent 37251c9
commit 2c82ad8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/PubNubDefs.h b/PubNubDefs.h
@@ -855,7 +855,7 @@ class MessageCracker {
             switch (c) {
             case '{':
             case '[':
-                d_bracket_level = 0;
+                d_bracket_level = 1;
                 d_state         = in_message;
                 msg.concat(c);
                 break;
@@ -873,7 +873,8 @@ class MessageCracker {
                 d_state = done;
                 break;
             default:
-                d_state = in_message;
+                d_bracket_level = 0;
+                d_state         = in_message;
                 msg.concat(c);
                 break;
             }
@@ -912,10 +913,13 @@ class MessageCracker {
                 break;
             case '}':
             case ']':
-                if (--d_bracket_level == 0) {
+                if (0 == d_bracket_level) {
+                    d_state = done;
+                }
+                else if (--d_bracket_level == 0) {
                     d_state = ground_zero;
+                    msg.concat(c);
                 }
-                msg.concat(c);
                 break;
             default:
                 msg.concat(c);
@@ -1009,7 +1013,7 @@ class SubscribeCracker {
     int get(String& msg)
     {
         msg.remove(0);
-        while (!finished() && !d_crack.msg_complete(msg)) {
+        while (!finished() && !message_complete(msg)) {
             if (!d_psc->wait_for_data()) {
                 break;
             }

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Pubnub
-version=3.2.0
+version=3.2.1
 author=Vladimir Veljkovic <vlada@pubnub.com>
 maintainer=Vladimir Veljkovic <vlada@pubnub.com>
 sentence=Pubnub SDK for Arduino.