Merge pull request jooby-project#2220 from jooby-project/2210

jknack · web-flow · commit f04c037707bf · 2021-01-13T08:44:24.000-03:00
WebSocket enhancements
diff --git a/jooby/src/main/java/io/jooby/Server.java b/jooby/src/main/java/io/jooby/Server.java
@@ -139,8 +139,10 @@ static boolean connectionLost(@Nullable Throwable cause) {
       String message = cause.getMessage();
       if (message != null) {
         String msg = message.toLowerCase();
-        return msg.contains("reset by peer") || msg.contains("broken pipe") || msg
-            .contains("forcibly closed");
+        return msg.contains("reset by peer")
+            || msg.contains("broken pipe")
+            || msg.contains("forcibly closed")
+            || msg.contains("connection reset");
       }
     }
     return (cause instanceof ClosedChannelException) || (cause instanceof EOFException);
diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyWebSocket.java
@@ -5,6 +5,17 @@
  */
 package io.jooby.internal.netty;
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+
+import javax.annotation.Nonnull;
+
 import io.jooby.Context;
 import io.jooby.Router;
 import io.jooby.Server;
@@ -24,16 +35,6 @@
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.util.AttributeKey;
 
-import javax.annotation.Nonnull;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-
 public class NettyWebSocket implements WebSocketConfigurer, WebSocket, ChannelFutureListener {
   /** All connected websocket. */
   private static final ConcurrentMap<String, List<NettyWebSocket>> all = new ConcurrentHashMap<>();
@@ -155,20 +156,22 @@ void handleFrame(WebSocketFrame frame) {
 
   private void handleMessage(WebSocketFrame frame) {
     try {
-      if (frame.isFinalFragment()) {
-        ByteBuf content;
-        if (buffer != null) {
-          buffer.writeBytes(frame.content());
-          content = buffer;
-          buffer = null;
+      if (messageCallback != null) {
+        if (frame.isFinalFragment()) {
+          ByteBuf content;
+          if (buffer != null) {
+            buffer.writeBytes(frame.content());
+            content = buffer;
+            buffer = null;
+          } else {
+            content = frame.content();
+          }
+          WebSocketMessage message = WebSocketMessage.create(getContext(), array(content));
+
+          fireCallback(webSocketTask(() -> messageCallback.onMessage(this, message), false));
         } else {
-          content = frame.content();
+          buffer = Unpooled.copiedBuffer(frame.content());
         }
-        WebSocketMessage message = WebSocketMessage.create(getContext(), array(content));
-
-        fireCallback(webSocketTask(() -> messageCallback.onMessage(this, message), false));
-      } else {
-        buffer = Unpooled.copiedBuffer(frame.content());
       }
     } finally {
       frame.release();
diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowWebSocket.java
@@ -198,12 +198,19 @@ private void dispatch(Runnable runnable) {
   @Override protected void onError(WebSocketChannel channel, Throwable x) {
     // should close?
     if (Server.connectionLost(x) || SneakyThrows.isFatal(x)) {
-      handleClose(WebSocketCloseStatus.SERVER_ERROR);
+      if (channel.isOpen()) {
+        handleClose(WebSocketCloseStatus.SERVER_ERROR);
+      }
     }
 
     if (onErrorCallback == null) {
-      ctx.getRouter().getLog()
-          .error("Websocket resulted in exception: {}", ctx.getRequestPath(), x);
+      if (Server.connectionLost(x)) {
+        ctx.getRouter().getLog()
+            .debug("Websocket connection lost: {}", ctx.getRequestPath(), x);
+      } else {
+        ctx.getRouter().getLog()
+            .error("Websocket resulted in exception: {}", ctx.getRequestPath(), x);
+      }
     } else {
       onErrorCallback.onError(this, x);
     }
@@ -215,8 +222,10 @@ private void dispatch(Runnable runnable) {
 
   @Override protected void onCloseMessage(CloseMessage cm,
       WebSocketChannel channel) {
-    handleClose(WebSocketCloseStatus.valueOf(cm.getCode())
-        .orElseGet(() -> new WebSocketCloseStatus(cm.getCode(), cm.getReason())));
+    if (channel.isOpen()) {
+      handleClose(WebSocketCloseStatus.valueOf(cm.getCode())
+          .orElseGet(() -> new WebSocketCloseStatus(cm.getCode(), cm.getReason())));
+    }
   }
 
   private void handleClose(WebSocketCloseStatus closeStatus) {

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,10 @@ static boolean connectionLost(@Nullable Throwable cause) {`
`139`	`139`	`String message = cause.getMessage();`
`140`	`140`	`if (message != null) {`
`141`	`141`	`String msg = message.toLowerCase();`
`142`		`- return msg.contains("reset by peer") \|\| msg.contains("broken pipe") \|\| msg`
`143`		`- .contains("forcibly closed");`
	`142`	`+ return msg.contains("reset by peer")`
	`143`	`+ \|\| msg.contains("broken pipe")`
	`144`	`+ \|\| msg.contains("forcibly closed")`
	`145`	`+ \|\| msg.contains("connection reset");`
`144`	`146`	`}`
`145`	`147`	`}`
`146`	`148`	`return (cause instanceof ClosedChannelException) \|\| (cause instanceof EOFException);`