Merge pull request #22 from youngmonkeys/fix-ping-schedule-issue

fix ping schedule issue

Author: tvd12

.gitignore

@@ -1,3 +1,18 @@
+example/example
+libezyfox-client.a
+.idea/
+CMakeFiles/
+Makefile
+cmake-build-debug/
+cmake_install.cmake
+example/.idea/
+example/CMakeCache.txt
+example/CMakeFiles/
+example/Makefile
+example/Testing/
+example/cmake_install.cmake
+example/example.cbp
+ezyfox-client.cbp
 **/xcuserdata/
 .DS_Store
 *.DS_Store

README.md

@@ -83,7 +83,7 @@ protected:
     }
 };
 
-class ExAppAccessHandler : public handler::EzyAccessAppHandler {
+class ExAppAccessHandler : public handler::EzyAppAccessHandler {
 protected:
     void postHandle(entity::EzyApp* app, entity::EzyArray* data) {
         auto obj = new entity::EzyObject();

example/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required(VERSION 3.6)
+
+set( CMAKE_CXX_FLAGS "-std=gnu++11 -pthread")
+
+add_definitions(-DEZY_DEBUG)
+
+set(APP_NAME example)
+
+project(${APP_NAME})
+
+add_subdirectory(../ ../)
+
+# add cross-platforms source files and header files 
+list(APPEND APP_SOURCE
+     main.cpp
+     )
+list(APPEND APP_HEADER
+    )
+
+# mark app complie info and libs info
+set(all_code_files
+    ${APP_HEADER}
+    ${APP_SOURCE}
+    )
+
+add_executable(${APP_NAME} main.cpp)
+
+target_link_libraries(${APP_NAME} ezyfox-client)

example/main.cpp

@@ -0,0 +1,69 @@
+//
+//  main.cpp
+//  ezyfox-console
+//
+//  Created by Dzung on 08/08/2021.
+//
+
+#include <iostream>
+#include "EzyHeaders.h"
+
+const char* ZONE_NAME = "example";
+const char* APP_NAME = "hello-world";
+
+class HandshakeHandler : public handler::EzyHandshakeHandler {
+protected:
+    request::EzyRequest* getLoginRequest() {
+        auto request = request::EzyLoginRequest::create();
+        request->setZoneName(ZONE_NAME);
+        request->setUsername("dungtv");
+        request->setPassword("123456");
+        return request;
+    };
+};
+
+class LoginSuccessHandler : public handler::EzyLoginSuccessHandler {
+protected:
+    void handleLoginSuccess(entity::EzyValue* responseData) {
+        auto appRequest = request::EzyAppAccessRequest::create();
+        appRequest->setAppName(APP_NAME);
+        mClient->send(appRequest);
+    }
+};
+
+class AppAccessHandler : public handler::EzyAppAccessHandler {
+protected:
+    void postHandle(entity::EzyApp* app, entity::EzyArray* data) {
+        auto requestData = new entity::EzyObject();
+        requestData->setString("who", "C/C++ Developer");
+        app->send("greet", requestData);
+    }
+};
+
+class GreetResponseHandler : public handler::EzyAbstractAppDataHandler<entity::EzyObject> {
+protected:
+    void process(entity::EzyApp* app, entity::EzyObject* data) {
+        logger::log("recived message: %s", data->getString("message").c_str());
+    }
+};
+
+int main(int argc, const char * argv[]) {
+    auto config = config::EzyClientConfig::create();
+    config->setClientName(ZONE_NAME);
+    auto mSocketClient = EzyUTClient::create(config);
+    EzyClients::getInstance()->addClient(mSocketClient);
+    auto setup = mSocketClient->setup();
+    setup->addDataHandler(constant::Handshake, new HandshakeHandler());
+    setup->addDataHandler(constant::Login, new LoginSuccessHandler());
+    setup->addDataHandler(constant::AppAccess, new AppAccessHandler());
+    
+    auto appSetup = setup->setupApp("hello-world");
+    appSetup->addDataHandler("greet", new GreetResponseHandler());
+    
+    mSocketClient->connect("tvd12.com", 3005);
+    
+    socket::EzyMainEventsLoop* eventsLoop = new socket::EzyMainEventsLoop();
+    eventsLoop->start();
+    EZY_SAFE_DELETE(eventsLoop);
+}
+

src/EzyClient.cpp

@@ -36,7 +36,7 @@ EzyClient* EzyClient::create(config::EzyClientConfig *config) {
 void EzyClient::init(config::EzyClientConfig *config) {
     mConfig = config;
     mName = config->getClientName();
-    mPingManager = new manager::EzyPingManager();
+    mPingManager = new manager::EzyPingManager(config->getPing());
     mPingSchedule = new socket::EzyPingSchedule(this);
     mHandlerManager = new manager::EzyHandlerManager(this);
     mRequestSerializer = new request::EzyRequestSerializer();

src/codec/EzyEncryption.cpp

@@ -148,11 +148,22 @@ char* EzyRSA::decrypt(const char* message, int size, std::string privateKey, int
 }
 
 std::string EzyRSA::decodePublicKey(const char *publicKey, int size) {
-    std::string copy(publicKey);
-    copy.erase(copy.begin(), copy.begin() + beginPublicKey.size());
-    copy.erase(copy.end() - endPublicKey.size(), copy.end());
-    copy.erase(std::remove(copy.begin(), copy.end(), '\n'), copy.end());
-    return copy;
+    int unnecessarySize = (int)beginPublicKey.size() + (int)endPublicKey.size();
+    if(size < unnecessarySize) {
+        return "";
+    }
+    char* copy = (char*)malloc(size - unnecessarySize);
+    int start = (int)beginPublicKey.size();
+    int end = size - (int)beginPublicKey.size();
+    int actualSize = 0;
+    for(int i = start ; i < end ; ++i) {
+        if(publicKey[i] != '\n') {
+            copy[actualSize ++] = publicKey[i];
+        }
+    }
+    std::string answer = std::string(copy, actualSize);
+    EZY_SAFE_FREE(copy);
+    return answer;
 }
 
 //====================================================

src/config/EzyClientConfig.cpp

@@ -9,12 +9,14 @@ EzyClientConfig* EzyClientConfig::create() {
 
 EzyClientConfig::EzyClientConfig() {
     this->mClientName = "";
+    this->mPing = new EzyPingConfig();
     this->mSocket = new EzySocketConfig();
     this->mReconnect = new EzyReconnectConfig();
 }
 
 EzyClientConfig::~EzyClientConfig() {
     EZY_SAFE_DELETE(mSocket);
+    EZY_SAFE_DELETE(mPing);
     EZY_SAFE_DELETE(mReconnect);
 }
 
@@ -29,6 +31,11 @@ void EzyClientConfig::setSocket(EzySocketConfig *socket) {
     this->mSocket = socket;
 }
 
+void EzyClientConfig::setPing(EzyPingConfig* ping) {
+    EZY_SAFE_DELETE(mPing);
+    this->mPing = ping;
+}
+
 void EzyClientConfig::setReconnect(EzyReconnectConfig* reconnect) {
     EZY_SAFE_DELETE(mReconnect);
     this->mReconnect = reconnect;
@@ -44,6 +51,12 @@ EzySocketConfig::EzySocketConfig() {
     this->mUdpDecodeReserveSize = 8 * 1024;
 }
 
+//============================
+EzyPingConfig::EzyPingConfig() {
+    this->mPingPeriod = 3000;
+    this->mMaxLostPingCount = 5;
+}
+
 //============================
 
 EzyReconnectConfig::EzyReconnectConfig() {

src/config/EzyClientConfig.h

@@ -7,20 +7,23 @@
 EZY_NAMESPACE_START_WITH_ONLY(config)
 
 class EzySocketConfig;
+class EzyPingConfig;
 class EzyReconnectConfig;
 
 class EzyClientConfig {
 protected:
     EZY_SYNTHESIZE(std::string, ZoneName);
     EZY_SYNTHESIZE_WRITEONLY(std::string, ClientName);
     EZY_SYNTHESIZE_READONLY(EzySocketConfig*, Socket);
+    EZY_SYNTHESIZE_READONLY(EzyPingConfig*, Ping);
     EZY_SYNTHESIZE_READONLY(EzyReconnectConfig*, Reconnect);
 public:
     static EzyClientConfig* create();
     EzyClientConfig();
     ~EzyClientConfig();
     std::string getClientName();
     void setSocket(EzySocketConfig* socket);
+    void setPing(EzyPingConfig* ping);
     void setReconnect(EzyReconnectConfig* reconnect);
 };
 
@@ -37,6 +40,17 @@ class EzySocketConfig {
     EzySocketConfig();
 };
 
+//============================
+
+class EzyPingConfig {
+protected:
+    EZY_SYNTHESIZE(int, PingPeriod);
+    EZY_SYNTHESIZE(int, MaxLostPingCount);
+public:
+    EzyPingConfig();
+};
+
+
 //============================
 
 class EzyReconnectConfig {

src/logger/EzyLogger.cpp

@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <cstdarg>
 #include <string>
+#include <cstring>
 
 #if defined(_WIN32) || defined(WINRT)
 #include "Windows.h"

src/manager/EzyAppManager.cpp

@@ -34,7 +34,7 @@ entity::EzyApp* EzyAppManager::removeApp(int appId) {
     if(app) {
         mAppByIds.erase(appId);
         mAppByNames.erase(app->getName());
-        auto appIndex = std::find(mAppList.begin(), mAppList.end(), app);
+        auto appIndex = stdex::find(mAppList.begin(), mAppList.end(), app);
         if(appIndex != mAppList.end()) {
             mAppList.erase(appIndex);
         }