Implemented WsjcppJsonRpc20WebSocketServer

Author: sea5kg

src/wsjcpp_jsonrpc20.cpp

@@ -33,10 +33,7 @@ nlohmann::json WsjcppJsonRpc20Error::toJson() {
 }
 
 // ---------------------------------------------------------------------
-
-/*! 
- * WsjcppJsonRpc20UserSession - all data by current user session
- * */
+// WsjcppJsonRpc20UserSession - all data by current user session
 
 WsjcppJsonRpc20UserSession::WsjcppJsonRpc20UserSession() {
     TAG = "WsjcppJsonRpc20UserSession";
@@ -388,6 +385,77 @@ void WsjcppJsonRpc20WebSocketClient::unsetUserSession() {
     m_pUserSession = nullptr;
 }
 
+// ---------------------------------------------------------------------
+// WsjcppJsonRpc20WebSocketServer
+
+WsjcppJsonRpc20WebSocketServer::WsjcppJsonRpc20WebSocketServer() {
+    TAG = "WsjcppJsonRpc20WebSocketServer";
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20WebSocketServer::onWebSocketConnected(void *pClient, WsjcppJsonRpc20WebSocketClient *pWebSocketClient) {
+    m_mapClients[pClient] = pWebSocketClient;
+    WsjcppLog::info(TAG, "NewConnection url=" + pWebSocketClient->getRequestUrl()  + " "
+        + pWebSocketClient->getPeerIpAddress()
+        + ":" + std::to_string(pWebSocketClient->getPeerPort()));
+    
+    nlohmann::json jsonResult;
+    jsonResult["method"] = "notify";
+    jsonResult["id"] = "n0";
+    nlohmann::json jsonServer;
+    jsonServer["app_name"] = WSJCPP_APP_NAME;
+    jsonServer["app_version"] = WSJCPP_APP_VERSION;
+    jsonResult["result"] = jsonServer;
+    pWebSocketClient->sendTextMessage(jsonResult.dump());
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20WebSocketServer::onWebSocketDisconnected(void *pClient) {
+    // TODO fix memoryleak clean usersession if need - smart pointer
+    
+    std::map<void *, WsjcppJsonRpc20WebSocketClient *>::iterator it;
+    it = m_mapClients.find(pClient);
+    m_mapClients.erase(it);
+    delete m_mapClients[pClient];
+}
+
+// ---------------------------------------------------------------------
+
+int WsjcppJsonRpc20WebSocketServer::getConnectedClients() {
+    return m_mapClients.size();
+}
+
+// ---------------------------------------------------------------------
+
+WsjcppJsonRpc20WebSocketClient *WsjcppJsonRpc20WebSocketServer::findWebSocketClient(void *pClient) {
+    WsjcppJsonRpc20WebSocketClient *pRet = nullptr;
+    std::map<void *, WsjcppJsonRpc20WebSocketClient *>::iterator it;
+    it = m_mapClients.find(pClient);
+    if (it != m_mapClients.end()) {
+        pRet = it->second;
+    }
+    return pRet;
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20WebSocketServer::sendMessageToAll(const nlohmann::json& jsonMessage) {
+    std::string sTextMessage = jsonMessage.dump();
+    std::map<void *, WsjcppJsonRpc20WebSocketClient *>::iterator it;
+    for (it = m_mapClients.begin(); it != m_mapClients.end(); ++it) {
+        it->second->sendTextMessage(sTextMessage);
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void WsjcppJsonRpc20WebSocketServer::sendMessageToOne(WsjcppJsonRpc20WebSocketClient *pClient, const nlohmann::json &jsonMessage) {
+    std::string sTextMessage = jsonMessage.dump();
+    pClient->sendTextMessage(sTextMessage);
+}
+
 // ---------------------------------------------------------------------
 // WsjcppJsonRpc20ParamDef
 
@@ -623,4 +691,4 @@ const std::vector<WsjcppValidatorJsonBase *> &WsjcppJsonRpc20ParamDef::listOfJso
     return m_vValidatorsJson;
 }
 
-// ---------------------------------------------------------------------
+// ---------------------------------------------------------------------

src/wsjcpp_jsonrpc20.h

@@ -10,7 +10,7 @@
 class WsjcppJsonRpc20Error;
 class WsjcppJsonRpc20UserSession;
 class WsjcppJsonRpc20ParamDef;
-class WsjcppJsonRpc20WebSocket;
+class WsjcppJsonRpc20WebSocketClient;
 class WsjcppJsonRpc20WebSocketServer;
 class WsjcppJsonRpc20ParamDef;
 class WsjcppJsonRpc20Request;
@@ -94,15 +94,21 @@ class WsjcppJsonRpc20UserSession {
 };
 
 // ---------------------------------------------------------------------
-// WsjcppJsonRpc20WebSocket
+// WsjcppJsonRpc20WebSocketClient
 
 class WsjcppJsonRpc20WebSocketClient {
     public:
         WsjcppJsonRpc20WebSocketClient();
         void setUserSession(WsjcppJsonRpc20UserSession *pUserSession);
         WsjcppJsonRpc20UserSession *getUserSession();
         void unsetUserSession();
-        
+        virtual void onDisconnected() = 0;
+        virtual std::string getPeerIpAddress() = 0;
+        virtual int getPeerPort() = 0;
+        virtual std::string getRequestUrl() = 0;
+
+        virtual void sendTextMessage(const std::string &sTextMessage) = 0;
+
     protected:
         std::string TAG;
 
@@ -112,26 +118,27 @@ class WsjcppJsonRpc20WebSocketClient {
 
 // ---------------------------------------------------------------------
 // WsjcppJsonRpc20WebSocketServer
-/*
+
 class WsjcppJsonRpc20WebSocketServer {
     public:
-        virtual void sendMessage(
-            WsjcppJsonRpc20WebSocket *pClient,
-            const nlohmann::json& jsonResponse
-        ) = 0;
-        virtual void sendMessageError(
-            WsjcppJsonRpc20WebSocket *pClient,
-            const std::string &sCmd,
-            const std::string & sM,
-            WsjcppJsonRpc20Error error
-        ) = 0;
-        virtual void sendToAll(const nlohmann::json& jsonMessage) = 0;
-        virtual void sendToOne(WsjcppJsonRpc20WebSocket *pClient, const nlohmann::json &jsonMessage) = 0;
-        virtual int getConnectedUsers() = 0;
-        virtual void setWsjcppJsonRpc20UserSession(WsjcppJsonRpc20WebSocket *pClient, WsjcppJsonRpc20UserSession *pUserSession) = 0; 
-        virtual WsjcppJsonRpc20UserSession *getWsjcppJsonRpc20UserSession(WsjcppJsonRpc20WebSocket *pClient) = 0;
+        WsjcppJsonRpc20WebSocketServer();
+
+
+        void onWebSocketConnected(void *pClient, WsjcppJsonRpc20WebSocketClient *pWebSocketClient);
+        void onWebSocketDisconnected(void *pClient);
+        int getConnectedClients();
+        // TODO int getConnectedUsers();
+
+        WsjcppJsonRpc20WebSocketClient *findWebSocketClient(void *pClient);
+        void sendMessageToAll(const nlohmann::json& jsonMessage);
+        void sendMessageToOne(WsjcppJsonRpc20WebSocketClient *pClient, const nlohmann::json &jsonMessage);
+
+    protected:
+        std::string TAG;
+
+    private:
+        std::map<void *, WsjcppJsonRpc20WebSocketClient *> m_mapClients;
 };
-*/
 
 /*! 
  * WsjcppJsonRpc20ParamDef - helper api for define input params and descrip it for docs.
@@ -221,7 +228,6 @@ class WsjcppJsonRpc20Request {
         std::string command();
         bool hasCommand();
         void sendMessageError(const std::string &cmd, WsjcppJsonRpc20Error error);
-        void sendMessageSuccess(const std::string &cmd, nlohmann::json& jsonResponse);
         void sendResponse(nlohmann::json& jsonResult);
 
         // bool validateInputParameters(Error &error, CmdHandlerBase *pCmdHandler);
@@ -322,4 +328,4 @@ class WsjcppJsonRpc20ServerApi : public WsjcppJsonRpc20Base {
         virtual void handle(WsjcppJsonRpc20Request *pRequest);
 };
 */
-#endif // WSJCPP_JSONRPC20
+#endif // WSJCPP_JSONRPC20