ofJson

Author: tyhenry

libs/ofxLibwebsockets/include/ofxLibwebsockets/Events.h

@@ -20,7 +20,7 @@ namespace ofxLibwebsockets {
 
         Connection& conn;
         std::string message; // message from ws OR error message if error
-        Json::Value json;
+        ofJson json;
 
         // binary data
         bool isBinary;
@@ -36,4 +36,4 @@ namespace ofxLibwebsockets {
  ofEvent<ofxLibwebsockets::Event> onClose;
  ofEvent<ofxLibwebsockets::Event> onIdle;
  ofEvent<ofxLibwebsockets::Event> onMessage;
- };*/
+ };*/

libs/ofxLibwebsockets/include/ofxLibwebsockets/Protocol.h

@@ -19,8 +19,6 @@ namespace ofxLibwebsockets {
 
     class Reactor;
 
-    #include "json.h"
-
     class Protocol
     {
         friend class Reactor;
@@ -76,4 +74,4 @@ namespace ofxLibwebsockets {
         bool _allowClient(const std::string name,
                           const std::string ip) const;
     };
-};
+};

libs/ofxLibwebsockets/include/ofxLibwebsockets/Reactor.h

@@ -75,8 +75,6 @@ namespace ofxLibwebsockets {
         // maybe this should be a map?
         vector<Connection *> connections;
 
-    private:
-        Json::Reader reader;
 
     };
 

libs/ofxLibwebsockets/src/Reactor.cpp

@@ -251,14 +251,18 @@ namespace ofxLibwebsockets {
                         }
 
                         if (_message != NULL && len > 0 && (!bReceivingLargeMessage || bFinishedReceiving) ){
-                            args.json = Json::Value( Json::nullValue );
 
-                            bool parsingSuccessful = ( bParseJSON ? reader.parse( args.message, args.json ) : false);
-                            if ( !parsingSuccessful ){
-                                // report to the user the failure and their locations in the document.
-                                ofLog( OF_LOG_VERBOSE, "[ofxLibwebsockets] Failed to parse JSON\n"+ reader.getFormatedErrorMessages() );
-                                args.json = Json::Value( Json::nullValue );
+                            if ( bParseJSON ){
+                                try {
+                                    args.json = ofJson::parse( args.message );
+                                }
+                                catch( std::exception& e ){
+                                    // report to the user the failure
+                                    args.json.clear();
+                                    ofLogVerbose() << "[ofxLibwebsockets] Failed to parse JSON: " <<  e.what();
+                                }
                             }
+                            
                         }
                     }