fix ping schedule issue

Author: tvd12

pom.xml

@@ -6,17 +6,17 @@
 	<parent>
 		<groupId>com.tvd12</groupId>
 		<artifactId>ezyfox</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>ezyfox-server-java-client</artifactId>
 
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 	<name>ezyfox-server-java-client</name>
 	<url>https://youngmonkeys.org/</url>
 
 	<properties>
-		<ezy.version>1.1.9</ezy.version>
+		<ezy.version>1.2.0</ezy.version>
 	</properties>
 
 	<dependencies>

src/main/java/com/tvd12/ezyfoxserver/client/EzyClient.java

@@ -13,8 +13,8 @@
 import com.tvd12.ezyfoxserver.client.manager.EzyPingManager;
 import com.tvd12.ezyfoxserver.client.request.EzyRequest;
 import com.tvd12.ezyfoxserver.client.setup.EzySetup;
-import com.tvd12.ezyfoxserver.client.socket.EzyISocketClient;
 import com.tvd12.ezyfoxserver.client.socket.EzyPingSchedule;
+import com.tvd12.ezyfoxserver.client.socket.EzySocketClient;
 
 /**
  * Created by tavandung12 on 9/20/18.
@@ -90,7 +90,7 @@ public interface EzyClient extends EzyCloseable {
 
     byte[] getPublicKey();
 
-    EzyISocketClient getSocket();
+    EzySocketClient getSocket();
 
     EzyApp getApp();
 

src/main/java/com/tvd12/ezyfoxserver/client/EzyTcpClient.java

@@ -31,7 +31,6 @@
 import com.tvd12.ezyfoxserver.client.request.EzySimpleRequestSerializer;
 import com.tvd12.ezyfoxserver.client.setup.EzySetup;
 import com.tvd12.ezyfoxserver.client.setup.EzySimpleSetup;
-import com.tvd12.ezyfoxserver.client.socket.EzyISocketClient;
 import com.tvd12.ezyfoxserver.client.socket.EzyPingSchedule;
 import com.tvd12.ezyfoxserver.client.socket.EzySocketClient;
 import com.tvd12.ezyfoxserver.client.socket.EzyTcpSocketClient;
@@ -304,7 +303,7 @@ public byte[] getPrivateKey() {
     }
 
     @Override
-    public EzyISocketClient getSocket() {
+    public EzySocketClient getSocket() {
     	return socketClient;
     }
 

src/main/java/com/tvd12/ezyfoxserver/client/socket/EzyPingSchedule.java

@@ -8,8 +8,6 @@
 import com.tvd12.ezyfox.util.EzyLoggable;
 import com.tvd12.ezyfoxserver.client.EzyClient;
 import com.tvd12.ezyfoxserver.client.constant.EzyDisconnectReason;
-import com.tvd12.ezyfoxserver.client.event.EzyDisconnectionEvent;
-import com.tvd12.ezyfoxserver.client.event.EzyEvent;
 import com.tvd12.ezyfoxserver.client.event.EzyLostPingEvent;
 import com.tvd12.ezyfoxserver.client.manager.EzyPingManager;
 import com.tvd12.ezyfoxserver.client.request.EzyPingRequest;
@@ -79,8 +77,7 @@ private void sendPingRequest() {
         int lostPingCount = pingManager.increaseLostPingCount();
         int maxLostPingCount = pingManager.getMaxLostPingCount();
         if(lostPingCount >= maxLostPingCount) {
-            EzyEvent event = new EzyDisconnectionEvent(EzyDisconnectReason.SERVER_NOT_RESPONDING.getId());
-            socketEventQueue.addEvent(event);
+        	client.getSocket().disconnect(EzyDisconnectReason.SERVER_NOT_RESPONDING.getId());
         }
         else {
             client.send(EzyPingRequest.getInstance());

src/main/java/com/tvd12/ezyfoxserver/client/socket/EzySocketClient.java

@@ -310,9 +310,11 @@ else if (socketWriter.isStopped()) {
     }
 
     protected void processReceivedMessages0() {
-        pingManager.setLostPingCount(0);
         popReadMessages();
         try {
+        	if (localMessageQueue.size() > 0) {
+        		pingManager.setLostPingCount(0);
+        	}
 	        for (int i = 0; i < localMessageQueue.size(); ++i) {
 	            processReceivedMessage(localMessageQueue.get(i));
 	        }

src/test/java/com/tvd12/ezyfoxserver/client/testing/EzyHelloClientTest.java

@@ -14,11 +14,13 @@
 import com.tvd12.ezyfoxserver.client.config.EzyClientConfig;
 import com.tvd12.ezyfoxserver.client.constant.EzyCommand;
 import com.tvd12.ezyfoxserver.client.entity.EzyApp;
+import com.tvd12.ezyfoxserver.client.event.EzyDisconnectionEvent;
 import com.tvd12.ezyfoxserver.client.event.EzyEventType;
 import com.tvd12.ezyfoxserver.client.handler.EzyAppAccessHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyAppDataHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyConnectionFailureHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyConnectionSuccessHandler;
+import com.tvd12.ezyfoxserver.client.handler.EzyDisconnectionHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyHandshakeHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyLoginSuccessHandler;
 import com.tvd12.ezyfoxserver.client.handler.EzyUdpHandshakeHandler;
@@ -33,41 +35,52 @@ public class EzyHelloClientTest {
 
 	public static void main(String[] args) throws Exception {
 		EzyClientConfig clientConfig = EzyClientConfig.builder()
-				.clientName("first")
+				.clientName("example")
 				.zoneName("example")
+				.pingConfigBuilder()
+					.pingPeriod(1000)
+					.done()
 				.build();
 		EzyClients clients = EzyClients.getInstance();
 		EzyClient client = new EzyUTClient(clientConfig);
 		clients.addClient(client);
 		EzySetup setup = client.setup();
 		setup.addEventHandler(EzyEventType.CONNECTION_SUCCESS, new EzyConnectionSuccessHandler());
 		setup.addEventHandler(EzyEventType.CONNECTION_FAILURE, new EzyConnectionFailureHandler());
+		setup.addEventHandler(EzyEventType.DISCONNECTION, new EzyDisconnectionHandler());
 		setup.addDataHandler(EzyCommand.HANDSHAKE, new HelloHandshakeEventHandler());
 		setup.addDataHandler(EzyCommand.LOGIN, new HelloLoginSuccessHandler());
 		setup.addDataHandler(EzyCommand.APP_ACCESS, new HelloAccessAppHandler());
 		setup.addDataHandler(EzyCommand.UDP_HANDSHAKE, new HelloUdpHandshakeHandler());
 
-		EzyAppSetup appSetup = setup.setupApp("hello");
+		EzyAppSetup appSetup = setup.setupApp("hello-world");
 		appSetup.addDataHandler("hello", new HelloMessageResponseHandler());
 
-		client.connect("127.0.0.1", 3005);
+		client.connect("tvd12.com", 3005);
 
 		EzyMainEventsLoop mainEventsLoop = new EzyMainEventsLoop();
 		mainEventsLoop.start();
 	}
 }
 
+class DisconnectionHandler extends EzyDisconnectionHandler {
+	@Override
+	protected void postHandle(EzyDisconnectionEvent event) {
+		System.out.print("disconnected");
+	}
+}
+
 class HelloHandshakeEventHandler extends EzyHandshakeHandler {
 	@Override
 	protected EzyRequest getLoginRequest() {
-		return new EzyLoginRequest("hello", "dungtv", "123456");
+		return new EzyLoginRequest("example", "dungtv", "123456");
 	}
 }
 
 class HelloLoginSuccessHandler extends EzyLoginSuccessHandler {
 	@Override
 	protected void handleLoginSuccess(EzyData responseData) {
-		client.send(new EzyAppAccessRequest("hello"));
+		client.send(new EzyAppAccessRequest("hello-world"));
 	}
 }