socket.io reconnect should also reconnect any previously connected endpoints

Author: koush

AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java

@@ -3,17 +3,13 @@
 import android.os.Handler;
 import android.text.TextUtils;
 
-import com.koushikdutta.async.AsyncServer;
 import com.koushikdutta.async.NullDataCallback;
 import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Cancellable;
 import com.koushikdutta.async.future.DependentCancellable;
-import com.koushikdutta.async.future.Future;
-import com.koushikdutta.async.future.SimpleFuture;
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.AsyncHttpResponse;
 import com.koushikdutta.async.http.WebSocket;
-import com.koushikdutta.async.http.server.AsyncHttpServer;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -94,12 +90,15 @@ void reconnect(final DependentCancellable child) {
             return;
         }
 
+        request.logi("Reconnecting socket.io");
+
         // dont invoke onto main handler, as it is unnecessary until a session is ready or failed
         request.setHandler(null);
         // initiate a session
         Cancellable cancel = httpClient.executeString(request, new AsyncHttpClient.StringCallback() {
             @Override
             public void onCompleted(final Exception e, AsyncHttpResponse response, String result) {
+                request.logi("socket.io session received");
                 if (e != null) {
                     reportDisconnect(e);
                     return;
@@ -202,6 +201,12 @@ public void run() {
 
     long reconnectDelay = 1000L;
     private void reportDisconnect(final Exception ex) {
+        if (ex != null) {
+            request.loge("socket.io disconnected", ex);
+        }
+        else {
+            request.logi("socket.io disconnected");
+        }
         select(null, new SelectCallback() {
             @Override
             public void onSelect(SocketIOClient client) {
@@ -393,5 +398,16 @@ public void onStringAvailable(String message) {
                 }
             }
         });
+
+        // now reconnect all the sockets that may have been previously connected
+        select(null, new SelectCallback() {
+            @Override
+            public void onSelect(SocketIOClient client) {
+                if (TextUtils.isEmpty(client.endpoint))
+                    return;
+
+                connect(client);
+            }
+        });
     }
 }

AndroidAsyncTest/src/com/koushikdutta/async/test/SocketIOTests.java

@@ -25,8 +25,13 @@
 
 public class SocketIOTests extends TestCase {
     public static final long TIMEOUT = 10000L;
-    
-    
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        AsyncServer.getDefault().stop();
+    }
+
     class TriggerFuture extends SimpleFuture<Boolean> {
         public void trigger(boolean val) {
             setComplete(val);
@@ -88,7 +93,7 @@ public void onString(String string, Acknowledge acknowledge) {
         });
         assertTrue(trigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
     }
-    
+
     public void testEchoServer() throws Exception {
         final TriggerFuture trigger1 = new TriggerFuture();
         final TriggerFuture trigger2 = new TriggerFuture();
@@ -136,12 +141,44 @@ public void onJSON(JSONObject json, Acknowledge acknowledge) {
     public void testReconnect() throws Exception {
         final TriggerFuture disconnectTrigger = new TriggerFuture();
         final TriggerFuture reconnectTrigger = new TriggerFuture();
+        final TriggerFuture endpointReconnectTrigger = new TriggerFuture();
+        final TriggerFuture echoTrigger = new TriggerFuture();
 
-        SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), "http://koush.clockworkmod.com:8080", new ConnectCallback() {
+        SocketIORequest req = new SocketIORequest("http://koush.clockworkmod.com:8080");
+        req.setLogging("socket.io", Log.VERBOSE);
+        SocketIOClient.connect(AsyncHttpClient.getDefaultInstance(), req, new ConnectCallback() {
             @Override
             public void onConnectCompleted(Exception ex, final SocketIOClient client) {
                 assertNull(ex);
 
+                client.of("/chat", new ConnectCallback() {
+                    @Override
+                    public void onConnectCompleted(Exception ex, final SocketIOClient client) {
+                        client.setReconnectCallback(new ReconnectCallback() {
+                            @Override
+                            public void onReconnect() {
+                                client.emit("hello");
+                                endpointReconnectTrigger.trigger(true);
+                            }
+                        });
+
+                        client.setStringCallback(new StringCallback() {
+                            @Override
+                            public void onString(String string, Acknowledge acknowledge) {
+                                echoTrigger.trigger("hello".equals(string));
+                            }
+                        });
+
+                        AsyncServer.getDefault().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                // this will trigger a reconnect
+                                client.getWebSocket().close();
+                            }
+                        }, 200);
+                    }
+                });
+
                 client.setDisconnectCallback(new DisconnectCallback() {
                     @Override
                     public void onDisconnect(Exception e) {
@@ -155,19 +192,13 @@ public void onReconnect() {
                         reconnectTrigger.trigger(true);
                     }
                 });
-
-                AsyncServer.getDefault().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        // this will trigger a reconnect
-                        client.getWebSocket().close();
-                    }
-                }, 200);
             }
         });
 
         assertTrue(disconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
         assertTrue(reconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(endpointReconnectTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(echoTrigger.get(TIMEOUT, TimeUnit.MILLISECONDS));
     }
 
     public void testEventAck() throws Exception {