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

fix: ping schedule issue
youngmonkeys · Sep 10, 2021 · e2799a4 · e2799a4
2 parents e93ca64 + 47fc3dc
commit e2799a4
Show file tree

Hide file tree

Showing 32 changed files with 216 additions and 26 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -55,6 +55,6 @@ repositories {
 
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation "com.tvd12:ezyfox-server-android-client:1.0.1"
+    implementation "com.tvd12:ezyfox-server-android-client:1.0.2"
     implementation "com.facebook.react:react-native:+"  // From node_modules
 }
diff --git a/android/src/main/java/com/tvd12/ezyfoxserver/client/react/proxy/EzyCreateClientMethod.java b/android/src/main/java/com/tvd12/ezyfoxserver/client/react/proxy/EzyCreateClientMethod.java
@@ -7,6 +7,7 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.tvd12.ezyfoxserver.client.EzyClient;
+import com.tvd12.ezyfoxserver.client.config.EzyPingConfig;
 import com.tvd12.ezyfoxserver.client.react.EzyMethodNames;
 import com.tvd12.ezyfoxserver.client.setup.EzySetup;
 import com.tvd12.ezyfoxserver.client.config.EzyClientConfig;
@@ -20,6 +21,8 @@
 import com.tvd12.ezyfoxserver.client.handler.EzyEventHandler;
 import com.tvd12.ezyfoxserver.client.react.serializer.EzyNativeSerializers;
 
+import java.util.Map;
+
 /**
  * Created by tavandung12 on 10/24/18.
  */
@@ -62,6 +65,14 @@ private EzyClientConfig newConfig(ReadableMap params) {
             configBuilder.enableSSL(params.getBoolean("enableSSL"));
         if(params.hasKey("enableDebug"))
             configBuilder.enableDebug(params.getBoolean("enableDebug"));
+        if(params.hasKey("ping")) {
+            ReadableMap ping = params.getMap("ping");
+            EzyPingConfig.Builder pingConfigBuilder = configBuilder.pingConfigBuilder();
+            if(ping.hasKey("pingPeriod"))
+                pingConfigBuilder.pingPeriod(ping.getInt("pingPeriod"));
+            if(ping.hasKey("maxLostPingCount"))
+                pingConfigBuilder.maxLostPingCount(ping.getInt("maxLostPingCount"));
+        }
         if(params.hasKey("reconnect")) {
             ReadableMap reconnect = params.getMap("reconnect");
             EzyReconnectConfig.Builder reconnectConfigBuilder = configBuilder.reconnectConfigBuilder();

diff --git a/...c/main/java/com/tvd12/ezyfoxserver/client/react/serializer/EzyClientConfigSerializer.java b/...c/main/java/com/tvd12/ezyfoxserver/client/react/serializer/EzyClientConfigSerializer.java
@@ -4,6 +4,7 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.tvd12.ezyfoxserver.client.config.EzyClientConfig;
+import com.tvd12.ezyfoxserver.client.config.EzyPingConfig;
 import com.tvd12.ezyfoxserver.client.config.EzyReconnectConfig;
 
 /**
@@ -16,12 +17,20 @@ public ReadableMap serialize(EzyClientConfig config) {
         WritableMap map = Arguments.createMap();
         map.putString("clientName", config.getClientName());
         map.putString("zoneName", config.getZoneName());
-        WritableMap reconnectMap = Arguments.createMap();
+
+        EzyPingConfig pingConfig = config.getPing();
+        WritableMap pingMap = Arguments.createMap();
+        pingMap.putInt("maxLostPingCount", pingConfig.getMaxLostPingCount());
+        pingMap.putInt("pingPeriod", (int)pingConfig.getPingPeriod());
+        map.putMap("ping", pingMap);
+
         EzyReconnectConfig reconnectConfig = config.getReconnect();
+        WritableMap reconnectMap = Arguments.createMap();
         reconnectMap.putInt("maxReconnectCount", reconnectConfig.getMaxReconnectCount());
         reconnectMap.putInt("reconnectPeriod", reconnectConfig.getReconnectPeriod());
         reconnectMap.putBoolean("enable", reconnectConfig.isEnable());
         map.putMap("reconnect", reconnectMap);
+
         return map;
     }
 

diff --git a/android/src/main/java/com/tvd12/ezyfoxserver/client/react/serializer/EzyEventSerializer.java b/android/src/main/java/com/tvd12/ezyfoxserver/client/react/serializer/EzyEventSerializer.java
@@ -52,7 +52,7 @@ public WritableMap apply(EzyEvent event) {
             public WritableMap apply(EzyEvent event) {
                 EzyConnectionFailureEvent mevent = (EzyConnectionFailureEvent)event;
                 WritableMap map = Arguments.createMap();
-                map.putString("reason", mevent.getReason().toString());
+                map.putInt("reason", mevent.getReason().getId());
                 return map;
             }
         });
@@ -61,9 +61,7 @@ public WritableMap apply(EzyEvent event) {
             public WritableMap apply(EzyEvent event) {
                 EzyDisconnectionEvent mevent = (EzyDisconnectionEvent)event;
                 WritableMap map = Arguments.createMap();
-                int reason = mevent.getReason();
-                String reasonName = EzyDisconnectReasons.getDisconnectReasonName(reason);
-                map.putString("reason", reasonName);
+                map.putInt("reason", mevent.getReason());
                 return map;
             }
         });

diff --git a/example/package.json b/example/package.json
@@ -10,7 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "ezyfox-server-react-native-client": "^1.0.0-beta5",
+    "ezyfox-server-react-native-client": "^1.0.1-beta2",
     "mvc-es6": "^1.1.1",
     "react": "17.0.1",
     "react-native": "0.64.2"

diff --git a/example/socket/SocketProxy.js b/example/socket/SocketProxy.js
@@ -17,6 +17,10 @@ class SocketProxy {
     config.clientName = ZONE_NAME;
     config.enableSSL = true;
     config.enableDebug = true;
+    config.ping.pingPeriod = 1000;
+    config.ping.maxLostPingCount = 3;
+    config.reconnect.reconnectPeriod = 1000;
+    config.reconnect.maxReconnectCount = 10;
     let clients = Ezy.Clients.getInstance();
     clients.newDefaultClient(config, client => {
       this.doSetup(client);
@@ -68,12 +72,33 @@ class SocketProxy {
       routerController.updateViews('change', 'login');
     };
 
+    let lostPingHandler = {};
+    lostPingHandler.handle = function (event) {
+      console.log('lost ping: ' + JSON.stringify(event));
+    };
+
+    let connectionFailureHandler = new Ezy.ConnectionFailureHandler();
+    connectionFailureHandler.preHandle = function (event) {
+      console.log('connection failed: ' + JSON.stringify(event));
+    };
+
+    connectionFailureHandler.onConnectionFailed = function (event) {
+      console.log(
+        'disconnected due to connection failed: ' + JSON.stringify(event),
+      );
+    };
+
     let setup = client.setup;
     setup.addEventHandler(
       Ezy.EventType.CONNECTION_SUCCESS,
       connectionSuccessHandler,
     );
+    setup.addEventHandler(
+      Ezy.EventType.CONNECTION_FAILURE,
+      connectionFailureHandler,
+    );
     setup.addEventHandler(Ezy.EventType.DISCONNECTION, disconnectionHandler);
+    setup.addEventHandler(Ezy.EventType.LOST_PING, lostPingHandler);
     setup.addDataHandler(Ezy.Command.HANDSHAKE, handshakeHandler);
     setup.addDataHandler(Ezy.Command.LOGIN, loginSuccessHandler);
     setup.addDataHandler(Ezy.Command.LOGIN_ERROR, loginErrorHandler);

diff --git a/ios/EzyClient/proxy/EzyMethodProxy.mm b/ios/EzyClient/proxy/EzyMethodProxy.mm
@@ -100,11 +100,23 @@
     EzyClientConfig* config = EzyClientConfig::create();
     NSString* clientName = [params valueForKey:@"clientName"];
     NSString* zoneName = [params valueForKey:@"zoneName"];
+    NSDictionary* ping = [params valueForKey:@"ping"];
     NSDictionary* reconnect = [params valueForKey:@"reconnect"];
     if(clientName)
         config->setClientName([clientName UTF8String]);
     if(zoneName)
         config->setZoneName([zoneName UTF8String]);
+    if(ping) {
+        NSNumber* pingPeriod = [ping objectForKey:@"pingPeriod"];
+        NSNumber* maxLostPingCount = [ping objectForKey:@"maxLostPingCount"];
+        EzyPingConfig* pingConfig = config->getPing();
+        if(pingPeriod) {
+            pingConfig->setPingPeriod((int)[pingPeriod integerValue]);
+        }
+        if(maxLostPingCount) {
+            pingConfig->setMaxLostPingCount((int)[maxLostPingCount integerValue]);
+        }
+    }
     if(reconnect) {
         NSNumber* enable = [reconnect objectForKey:@"enable"];
         NSNumber* reconnectPeriod = [reconnect objectForKey:@"reconnectPeriod"];

diff --git a/ios/EzyClient/serializer/EzyClientConfigSerializer.mm b/ios/EzyClient/serializer/EzyClientConfigSerializer.mm
@@ -18,12 +18,20 @@ - (NSDictionary *)serialize:(void *)value {
     NSDictionary* dict = [NSMutableDictionary dictionary];
     [dict setValue:[EzyNativeStrings newNSString:config->getClientName().c_str()] forKey:@"clientName"];
     [dict setValue:[EzyNativeStrings newNSString:config->getZoneName().c_str()] forKey:@"zoneName"];
-    NSDictionary* reconnectDict = [NSMutableDictionary dictionary];
+
+    EzyPingConfig* pingConfig = config->getPing();
+    NSDictionary* pingDict = [NSMutableDictionary dictionary];
+    [pingDict setValue:[NSNumber numberWithInt:pingConfig->getPingPeriod()] forKey:@"pingPeriod"];
+    [pingDict setValue:[NSNumber numberWithInt:pingConfig->getMaxLostPingCount()] forKey:@"maxLostPingCount"];
+    [dict setValue:pingDict forKey:@"ping"];
+
     EzyReconnectConfig* reconnectConfig = config->getReconnect();
+    NSDictionary* reconnectDict = [NSMutableDictionary dictionary];
     [reconnectDict setValue:[NSNumber numberWithInt:reconnectConfig->getMaxReconnectCount()] forKey:@"maxReconnectCount"];
     [reconnectDict setValue:[NSNumber numberWithInt:reconnectConfig->getReconnectPeriod()] forKey:@"reconnectPeriod"];
     [reconnectDict setValue:[NSNumber numberWithInt:reconnectConfig->isEnable()] forKey:@"enable"];
     [dict setValue:reconnectDict forKey:@"reconnect"];
+
     return dict;
 }
 @end
diff --git a/ios/EzyClient/serializer/EzyEventSerializer.mm b/ios/EzyClient/serializer/EzyEventSerializer.mm
@@ -53,15 +53,15 @@ -(NSDictionary*)serializeLostPingEvent: (EzyEvent*)event {
     EzyLostPingEvent* mevent = (EzyLostPingEvent*)event;
     NSDictionary* dict = [NSMutableDictionary dictionary];
     int count = mevent->getCount();
-    [dict setValue:[NSNumber numberWithInt:count] forKey:@"reason"];
+    [dict setValue:[NSNumber numberWithInt:count] forKey:@"count"];
     return dict;
 }
 
 -(NSDictionary*)serializeTryConnectEvent: (EzyEvent*)event {
     EzyTryConnectEvent* mevent = (EzyTryConnectEvent*)event;
     NSDictionary* dict = [NSMutableDictionary dictionary];
     int count = mevent->getCount();
-    [dict setValue:[NSNumber numberWithInt:count] forKey:@"reason"];
+    [dict setValue:[NSNumber numberWithInt:count] forKey:@"count"];
     return dict;
 }
 

diff --git a/ios/EzyClient/socket b/ios/EzyClient/socket
diff --git a/ios/ezyfox-server-react-native-client.xcodeproj/project.pbxproj b/ios/ezyfox-server-react-native-client.xcodeproj/project.pbxproj
@@ -1122,6 +1122,11 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"EZY_DEBUG=1",
+					"$(inherited)",
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

diff --git a/lib/commonjs/ezy-config.js b/lib/commonjs/ezy-config.js
diff --git a/lib/commonjs/ezy-config.js.map b/lib/commonjs/ezy-config.js.map
diff --git a/lib/commonjs/ezy-constants.js b/lib/commonjs/ezy-constants.js
+15 −0		.gitignore
+1 −1		README.md
+28 −0		example/CMakeLists.txt
+79 −0		example/main.cpp
+1 −1		src/EzyClient.cpp
+16 −5		src/codec/EzyEncryption.cpp
+13 −0		src/config/EzyClientConfig.cpp
+14 −0		src/config/EzyClientConfig.h
+1 −0		src/logger/EzyLogger.cpp
+1 −1		src/manager/EzyAppManager.cpp
+4 −3		src/manager/EzyPingManager.cpp
+5 −1		src/manager/EzyPingManager.h
+2 −2		src/socket/EzyPingSchedule.cpp
+3 −1		src/socket/EzySocketClient.cpp