Change startPushDebuggerSocket() to also receive proxy replies

Expects proxy replies to be json.

Author: tolauwae

src/Edward/proxy_supervisor.cpp

@@ -60,15 +60,23 @@ ProxySupervisor::ProxySupervisor(Channel *duplex, pthread_mutex_t *mutex) {
     printf("Started supervisor.\n");
     this->channel = duplex;
     this->mutex = mutex;
+    this->proxyResult = nullptr;
 
     pthread_create(&this->threadid, nullptr, readSocket, this);
 }
 
+bool isEvent(nlohmann::basic_json<> parsed) {
+    return parsed.find("topic") != parsed.end();
+}
+
+bool isReply(nlohmann::basic_json<> parsed) {
+    return parsed.find("success") != parsed.end();
+}
+
 void ProxySupervisor::startPushDebuggerSocket() {
     char _char;
     uint32_t buf_idx = 0;
     const uint32_t start_size = 1024;
-    uint32_t current_size = start_size;
     char *buffer = (char *)malloc(start_size);
 
     printf("Started listening for events from proxy device.\n");
@@ -89,9 +97,19 @@ void ProxySupervisor::startPushDebuggerSocket() {
             // first len argument
             buffer[buf_idx] = '\0';
             try {
-                Event *event = parseJSON(buffer);
-                CallbackHandler::push_event(event);
-                WARDuino::instance()->debugger->notifyPushedEvent();
+                nlohmann::basic_json<> parsed = nlohmann::json::parse(buffer);
+                debug("parseJSON: %s\n", parsed.dump().c_str());
+
+                if (isEvent(parsed)) {
+                    CallbackHandler::push_event(new Event(
+                        *parsed.find("topic"), *parsed.find("payload")));
+                    WARDuino::instance()->debugger->notifyPushedEvent();
+                }
+
+                if (isReply(parsed)) {
+                    this->proxyResult = parsed;
+                }
+
                 buf_idx = 0;
             } catch (const nlohmann::detail::parse_error &e) {
             }
@@ -105,13 +123,8 @@ bool ProxySupervisor::send(
     return n == size;
 }
 
-char *ProxySupervisor::readReply(short int amount) {
-    char *buffer = new char[amount + 1];
-    bzero(buffer, amount + 1);
-    ssize_t n = this->channel->read(buffer, amount);
-    if (n > 0) return buffer;
-
-    delete[] buffer;
+char *ProxySupervisor::readReply() {
+    // TODO use this->proxyResult
     return nullptr;
 }
 

src/Edward/proxy_supervisor.h

@@ -6,6 +6,7 @@
 
 #include "../Utils/sockets.h"
 #include "RFC.h"
+#include "nlohmann/json.hpp"
 #include "pthread.h"
 #include "sys/types.h"
 
@@ -16,6 +17,8 @@ class ProxySupervisor {
     pthread_mutex_t *mutex;
     std::set<uint32_t> *proxied = new std::set<uint32_t>();
 
+    nlohmann::basic_json<> proxyResult;
+
     struct SerializeData *serializeRFC(RFC *callee);
     void deserializeRFCResult(RFC *rfc);
 
@@ -25,7 +28,7 @@ class ProxySupervisor {
     void startPushDebuggerSocket();
 
     bool send(void *t_buffer, int t_size);
-    char *readReply(short int amount = 1024);
+    char *readReply();
 
     pthread_t getThreadID();