Fix timeout issue with WebSocket when the server close the connection

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -947,7 +947,7 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
 
         ChannelFuture channelFuture;
         ClientBootstrap bootstrap = request.getUrl().startsWith(WEBSOCKET) ? webSocketBootstrap : (useSSl ? secureBootstrap : plainBootstrap);
-        bootstrap.setOption("connectTimeoutMillis", config.getConnectionTimeoutInMs());
+        //bootstrap.setOption("connectTimeoutMillis", config.getConnectionTimeoutInMs());
 
         // Do no enable this with win.
         if (System.getProperty("os.name").toLowerCase().indexOf("win") == -1) {
@@ -1039,6 +1039,7 @@ private void finishChannel(final ChannelHandlerContext ctx) {
 
         log.debug("Closing Channel {} ", ctx.getChannel());
 
+
         try {
             ctx.getChannel().close();
         } catch (Throwable t) {
@@ -1284,6 +1285,7 @@ private void abort(NettyResponseFuture<?> future, Throwable t) {
             log.debug("Aborting Future {}\n", future);
             log.debug(t.getMessage(), t);
         }
+
         future.abort(t);
     }
 
@@ -1342,6 +1344,9 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws
                 }
             }
 
+            Protocol p = (ctx.getPipeline().get(HttpClientCodec.class) != null ? httpProtocol : webSocketProtocol);
+            p.onClose(ctx, e);
+
             if (future != null && !future.isDone() && !future.isCancelled()) {
                 if (!remotelyClosed(ctx.getChannel(), future)) {
                     abort(future, new IOException("Remotely Closed " + ctx.getChannel()));

src/test/java/com/ning/http/client/websocket/AbstractBasicTest.java

@@ -35,6 +35,10 @@ public abstract class AbstractBasicTest extends Server {
     public abstract class WebSocketHandler extends HandlerWrapper implements WebSocketFactory.Acceptor {
         private final WebSocketFactory _webSocketFactory = new WebSocketFactory(this, 32 * 1024);
 
+        public WebSocketHandler(){
+            _webSocketFactory.setMaxIdleTime(10000);
+        }
+
         public WebSocketFactory getWebSocketFactory() {
             return _webSocketFactory;
         }
@@ -83,7 +87,7 @@ protected String getTargetUrl() {
 
     @BeforeClass(alwaysRun = true)
     public void setUpGlobal() throws Exception {
-        port1 = 8080;
+        port1 = findFreePort();
         _connector = new SelectChannelConnector();
         _connector.setPort(port1);
 

src/test/java/com/ning/http/client/websocket/TextMessageTest.java

@@ -99,6 +99,36 @@ public void onError(Throwable t) {
         assertEquals(text.get(), "OnOpen");
     }
 
+    @Test(timeOut = 60000)
+    public void onTimeoutCloseTest() throws Throwable {
+        AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());
+        final CountDownLatch latch = new CountDownLatch(1);
+        final AtomicReference<String> text = new AtomicReference<String>("");
+
+        WebSocket websocket = c.prepareGet(getTargetUrl())
+                .execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
+
+                    @Override
+                    public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
+                    }
+
+                    @Override
+                    public void onClose(com.ning.http.client.websocket.WebSocket websocket) {
+                        text.set("OnClose");
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                        t.printStackTrace();
+                        latch.countDown();
+                    }
+                }).build()).get();
+
+        latch.await();
+        assertEquals(text.get(), "OnClose");
+    }
+
     @Test(timeOut = 60000)
     public void onClose() throws Throwable {
         AsyncHttpClient c = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().build());

src/test/java/com/ning/http/client/websocket/grizzly/GrizzlyByteMessageText.java renamed to src/test/java/com/ning/http/client/websocket/grizzly/GrizzlyByteMessageTest.java

@@ -18,7 +18,7 @@
 import com.ning.http.client.providers.grizzly.GrizzlyAsyncHttpProvider;
 import com.ning.http.client.websocket.ByteMessageTest;
 
-public class GrizzlyByteMessageText extends ByteMessageTest {
+public class GrizzlyByteMessageTest extends ByteMessageTest {
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         if (config == null) {

src/test/java/com/ning/http/client/websocket/grizzly/GrizzlyTextMessageText.java renamed to src/test/java/com/ning/http/client/websocket/grizzly/GrizzlyTextMessageTest.java

@@ -18,7 +18,7 @@
 import com.ning.http.client.providers.grizzly.GrizzlyAsyncHttpProvider;
 import com.ning.http.client.websocket.ByteMessageTest;
 
-public class GrizzlyTextMessageText extends ByteMessageTest {
+public class GrizzlyTextMessageTest extends ByteMessageTest {
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         if (config == null) {

src/test/java/com/ning/http/client/websocket/netty/NettyTextMessageText.java renamed to src/test/java/com/ning/http/client/websocket/netty/NettyByteMessageTest.java

@@ -15,9 +15,9 @@
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.async.ProviderUtil;
-import com.ning.http.client.websocket.ByteMessageTest;
+import com.ning.http.client.websocket.TextMessageTest;
 
-public class NettyTextMessageText extends ByteMessageTest {
+public class NettyByteMessageTest extends TextMessageTest {
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return ProviderUtil.nettyProvider(config);

src/test/java/com/ning/http/client/websocket/netty/NettyByteMessageText.java renamed to src/test/java/com/ning/http/client/websocket/netty/NettyTextMessageTest.java

@@ -15,10 +15,9 @@
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.async.ProviderUtil;
-import com.ning.http.client.async.ZeroCopyFileTest;
-import com.ning.http.client.websocket.ByteMessageTest;
+import com.ning.http.client.websocket.TextMessageTest;
 
-public class NettyByteMessageText extends ByteMessageTest {
+public class NettyTextMessageTest extends TextMessageTest {
     @Override
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return ProviderUtil.nettyProvider(config);