Status missing from Close WebSocket frame issued by client, close AsyncHttpClient#1199

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/handler/WebSocketHandler.java

@@ -182,6 +182,7 @@ private void handleFrame(Channel channel, WebSocketFrame frame, WebSocketUpgrade
             Channels.setDiscard(channel);
             CloseWebSocketFrame closeFrame = (CloseWebSocketFrame) frame;
             webSocket.onClose(closeFrame.statusCode(), closeFrame.reasonText());
+            Channels.silentlyCloseChannel(channel);
         } else {
             ByteBuf buf = frame.content();
             if (buf != null && buf.readableBytes() > 0) {
@@ -226,9 +227,9 @@ public void handleChannelInactive(NettyResponseFuture<?> future) {
             WebSocketUpgradeHandler h = (WebSocketUpgradeHandler) future.getAsyncHandler();
             NettyWebSocket webSocket = NettyWebSocket.class.cast(h.onCompleted());
 
-            logger.trace("Connection was closed abnormally (that is, with no close frame being sent).");
+            logger.trace("Connection was closed abnormally (that is, with no close frame being received).");
             if (webSocket != null)
-                webSocket.close(1006, "Connection was closed abnormally (that is, with no close frame being sent).");
+                webSocket.close(1006, "Connection was closed abnormally (that is, with no close frame being received).");
         } catch (Throwable t) {
             logger.error("onError", t);
         }

client/src/main/java/org/asynchttpclient/netty/ws/NettyWebSocket.java

@@ -16,7 +16,6 @@
 import static io.netty.buffer.Unpooled.wrappedBuffer;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
@@ -135,7 +134,7 @@ public boolean isOpen() {
     @Override
     public void close() {
         if (channel.isOpen()) {
-            channel.writeAndFlush(new CloseWebSocketFrame()).addListener(ChannelFutureListener.CLOSE);
+            channel.writeAndFlush(new CloseWebSocketFrame(1000, "normal closure"));
         }
     }
 

client/src/test/java/org/asynchttpclient/ws/CloseCodeReasonMessageTest.java

@@ -47,7 +47,7 @@ public void onCloseWithCode() throws Exception {
             websocket.close();
 
             latch.await();
-            assertTrue(text.get().startsWith("1000"));
+            assertTrue(text.get().startsWith("1000"), "Expected a 1000 code but got " + text.get());
         }
     }