bug/SKALE-3662 Adding libzmq

ServerWorker.cpp

@@ -8,6 +8,7 @@
 #include <zmq.hpp>
 #include "zhelpers.hpp"
 
+#include "Log.h"
 #include "ZMQMessage.h"
 
 #include "ServerWorker.h"
@@ -18,50 +19,67 @@ ServerWorker::ServerWorker(zmq::context_t &ctx, int sock_type) : ctx_(ctx),
 
 void ServerWorker::work() {
     worker_.connect("inproc://backend");
+
     std::string replyStr;
 
 
     while (true) {
+
+        Json::Value result;
+        int errStatus = -1 * (10000 + __LINE__);
+        result["status"] =  errStatus;
+        result["errorMessage"] = "Server error";
+
         try {
             zmq::message_t msg;
             worker_.recv(&msg);
 
             vector <uint8_t> msgData(msg.size() + 1, 0);
-            memcpy(msgData.data(), msg.data(), msg.size());
+            cerr << "Received:" << msgData.data();
+            sleep(1);
 
-
-            auto parsedMsg = ZMQMessage::parse(msgData, true);
+            auto parsedMsg = ZMQMessage::parse(
+                    (const char*) msgData.data(), msg.size(), true);
 
             CHECK_STATE(parsedMsg);
 
-            auto reply = parsedMsg->process();
+            result  = parsedMsg->process();
 
-            Json::FastWriter fastWriter;
 
-            replyStr = fastWriter.write(reply);
 
 
         }
 
 
-
+        catch (SGXException &e) {
+            result["status"] = e.getStatus();
+            result["errorMessage"] = e.getMessage();
+            spdlog::error("Exception in zmq server worker:{}", e.what());
+        }
         catch (std::exception &e) {
+            result["errorMessage"] = string(e.what());
             spdlog::error("Exception in zmq server worker:{}", e.what());
-            replyStr = "";
         } catch (...) {
             spdlog::error("Error in zmq server worker");
-            replyStr = "";
+            result["errorMessage"] = "Error in zmq server worker";
         }
 
         try {
 
-            zmq::message_t replyMsg(replyStr.c_str(), replyStr.size() + 1);
+            Json::FastWriter fastWriter;
+
+            replyStr = fastWriter.write(result);
+            replyStr = replyStr.substr(0, replyStr.size()  - 1 );
 
+            CHECK_STATE(replyStr.size()  > 2);
+            CHECK_STATE(replyStr.front() == '{');
+            CHECK_STATE(replyStr.back() == '}');
+            zmq::message_t replyMsg(replyStr.c_str(), replyStr.size() + 1);
             worker_.send(replyMsg);
         } catch (std::exception &e) {
-            spdlog::error("Exception in zmq server send :{}", e.what());
+            spdlog::error("Exception in zmq server worker send :{}", e.what());
         } catch (...) {
-            spdlog::error("Unklnown exception in zmq server send");
+            spdlog::error("Unklnown exception in zmq server worker send");
         }
     }
 

ZMQClient.cpp

@@ -32,6 +32,9 @@ shared_ptr <ZMQMessage> ZMQClient::doRequestReply(Json::Value &_req) {
 
     Json::FastWriter fastWriter;
     string reqStr = fastWriter.write(_req);
+    reqStr = reqStr.substr(0, reqStr.size() - 1);
+    CHECK_STATE(reqStr.front() == '{');
+    CHECK_STATE(reqStr.at(reqStr.size() - 1) == '}');
 
     auto resultStr = doZmqRequestReply(reqStr);
 
@@ -47,6 +50,9 @@ string ZMQClient::doZmqRequestReply(string &_req) {
         reconnect();
     CHECK_STATE(clientSocket);
 
+    cerr << "Sending:" << _req;
+    sleep(1);
+
     s_send(*clientSocket, _req);
 
     while (true) {
@@ -70,7 +76,6 @@ string ZMQClient::doZmqRequestReply(string &_req) {
 
 ZMQClient::ZMQClient(string &ip, uint16_t port) : ctx(1) {
     url = "tcp://" + ip + ":" + to_string(port);
-
 }
 
 void ZMQClient::reconnect() {

ZMQMessage.cpp

@@ -46,19 +46,16 @@ string ZMQMessage::getStringRapid(const char *_name) {
 };
 
 
-shared_ptr <ZMQMessage> ZMQMessage::parse(vector <uint8_t> &_msg, bool _isRequest) {
-    CHECK_STATE(_msg.size() > 2);
-    CHECK_STATE(_msg.back() == 0);
-    return parse((const char *) _msg.data(), _msg.size() - 1,  _isRequest);
 
-}
 
 shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg,
                                           size_t _size, bool _isRequest) {
 
 
-    CHECK_STATE(_size > 2);
+    cerr << "Server got:" <<  _msg << endl;
+
     CHECK_STATE(_msg);
+    CHECK_STATE(_size > 5);
     // CHECK NULL TERMINATED
     CHECK_STATE(_msg[_size] == 0);
     CHECK_STATE(_msg[_size - 1] == '}');

testw.cpp

@@ -1150,7 +1150,7 @@ TEST_CASE_METHOD(TestFixtureNoReset, "ZMQ-ecdsa", "[zmq-ecdsa-run]") {
         PRINT_SRC_LINE
         auto sig = client.ecdsaSignMessageHash(16, keyName, SAMPLE_HASH);
         REQUIRE(sig.size() > 10);
-    } catch (JsonRpcException &e) {
+    } catch (exception &e) {
         cerr << e.what() << endl;
         throw;
     }