Add Heartbeat + reconnect tests

Author: mythz

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -307,10 +307,10 @@ private void onConnectReceived() {
                     connectionInfo.getId(),
                     Utils.join(channels, ",")));
 
-        startNewHeartbeat();
-
         if (onConnect != null)
             onConnect.execute(connectionInfo);
+
+        startNewHeartbeat();
     }
 
     Timer heratbeatTimer;
@@ -322,10 +322,10 @@ private void startNewHeartbeat() {
         if (stopped.get())
             return;
 
-        if (heratbeatTimer != null)
-            heratbeatTimer.cancel();
+        if (heratbeatTimer == null)
+            heratbeatTimer = new Timer("ServerEventsClient Heartbeat");
 
-        heratbeatTimer = new Timer("ServerEventsClient Heartbeat");
+        //reschedule timer on every heartbeat
         heratbeatTimer.schedule(new TimerTask() {
             @Override
             public void run() {

src/AndroidClient/client/src/test/java/chat/chatdtos.java

@@ -1,5 +1,5 @@
 /* Options:
-Date: 2017-02-11 06:41:16
+Date: 2017-02-11 09:07:46
 Version: 4.00
 Tip: To override a DTO option, remove "//" prefix before updating
 BaseUrl: http://chat.servicestack.net
@@ -96,6 +96,12 @@ public static class ClearChatHistory implements IReturnVoid
 
     }
 
+    @Route("/reset-serverevents")
+    public static class ResetServerEvents implements IReturnVoid
+    {
+        
+    }
+
     @Route("/account")
     public static class GetUserDetails implements IReturn<GetUserDetailsResponse>
     {

src/AndroidClient/client/src/test/java/net/servicestack/client/tests/ServerEventClientTests.java

@@ -18,8 +18,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static chat.chatdtos.ChatMessage;
-import static chat.chatdtos.PostChatToChannel;
+import static chat.chatdtos.*;
 
 /**
  * Created by mythz on 2/10/2017.
@@ -263,4 +262,67 @@ public void test_Does_receive_messages() throws Exception {
             assertEquals(2, msgs2.size());
         }
     }
+
+    public void test_Does_send_multiple_heartbeats() throws Exception {
+        final CountDownLatch signal = new CountDownLatch(1);
+
+        List<ServerEventMessage> heartbeats = new ArrayList<>();
+        try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
+            .setOnConnect(e -> e.setHeartbeatIntervalMs(1000)) //change to 1s
+            .setOnHeartbeat(e -> {
+                heartbeats.add(e);
+                if (heartbeats.size() >= 3)
+                    signal.countDown();
+            })
+            .start()) {
+
+            assertTrue(signal.await(5, TimeUnit.SECONDS));
+
+            assertTrue(heartbeats.size() >= 3);
+        }
+    }
+
+    public void test_Does_reconnect_on_lost_connection() throws Exception {
+
+        List<ServerEventConnect> connectMsgs = new ArrayList<>();
+        List<ServerEventMessage> msgs1 = new ArrayList<>();
+        try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
+            .setOnConnect(connectMsgs::add)
+            .setOnMessage(msgs1::add)
+            .start()) {
+
+            while (connectMsgs.size() == 0){
+                Thread.sleep(100);
+            }
+
+            postChat(client1, "msg1 from client1");
+
+            while (msgs1.size() == 0){
+                Thread.sleep(100);
+            }
+
+            client1.getServiceClient().post(new ResetServerEvents());
+
+            try(ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net")
+                .setOnConnect(connectMsgs::add)
+                .start()) {
+
+                while (connectMsgs.size() < 3){ //client1 + client1 reconnect + client2
+                    Thread.sleep(100);
+                }
+
+                postChat(client2, "msg2 from client2");
+
+                while (msgs1.size() < 2){ //msg1 + msg2
+                    Thread.sleep(100);
+                }
+            }
+
+            ServerEventMessage msg2 = msgs1.get(1);
+
+            ChatMessage chatMsg2 = JsonUtils.fromJson(msg2.getJson(), ChatMessage.class);
+
+            assertEquals("msg2 from client2", chatMsg2.getMessage());
+        }
+    }
 }