WebSocket API: Jetty implementation

Author: jknack

examples/pom.xml

@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.jooby</groupId>
-      <artifactId>jooby-utow</artifactId>
+      <artifactId>jooby-jetty</artifactId>
       <version>${jooby.version}</version>
     </dependency>
     <dependency>

examples/src/main/java/examples/WebSocketApp.java

@@ -22,14 +22,19 @@ public class WebSocketApp extends Jooby {
         ws.send("Welcome");
       });
       initializer.onMessage((ws, msg) -> {
-        ws.send("Got: " + msg.value(), true);
+        throw new UnsupportedOperationException("OnMessage");
+//        ws.send("Got: " + msg.value());
       });
       initializer.onClose((ws, closeStatus) -> {
         System.out.println("Closed " + closeStatus);
       });
 
       initializer.onError((ws, cause) -> {
-        ws.getContext().getRouter().getLog().error("error ", cause);
+        if (ws.isOpen()) {
+          ws.send("error: " + cause.getMessage() );
+        } else {
+          ws.getContext().getRouter().getLog().error("error ", cause);
+        }
       });
 
     });

jooby/src/main/java/io/jooby/Context.java

@@ -666,9 +666,7 @@ public interface Context extends Registry {
    */
   @Nonnull Context detach(@Nonnull Route.Handler next) throws Exception;
 
-  default @Nonnull Context upgrade(@Nonnull WebSocket.Initializer handler) {
-    return null;
-  }
+  @Nonnull Context upgrade(@Nonnull WebSocket.Initializer handler);
 
   /*
    * **********************************************************************************************

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -289,6 +289,11 @@ public ForwardingContext(@Nonnull Context context) {
     return this;
   }
 
+  @Nonnull @Override public Context upgrade(@Nonnull WebSocket.Initializer handler) {
+    ctx.upgrade(handler);
+    return this;
+  }
+
   @Nonnull @Override public Context setResponseHeader(@Nonnull String name, @Nonnull Date value) {
     ctx.setResponseHeader(name, value);
     return this;

jooby/src/main/java/io/jooby/Router.java

@@ -80,6 +80,9 @@ interface Match {
   List<String> METHODS = unmodifiableList(
       asList(GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, TRACE));
 
+  /** Web socket. */
+  String WS = "WS";
+
   /**
    * Mutable map of application attributes.
    *

jooby/src/main/java/io/jooby/WebSocket.java

@@ -103,6 +103,9 @@ interface OnError {
     void onError(@Nonnull WebSocket ws, @Nonnull Throwable cause);
   }
 
+  /** Max message size for websocket (13k). */
+  int MAX_BUFFER_SIZE = 131072;
+
   /**
    * Originating HTTP context. Please note this is a read-only context, so you are not allowed
    * to modify or produces a response from it.

jooby/src/main/java/io/jooby/WebSocketCloseStatus.java

@@ -1,6 +1,5 @@
 package io.jooby;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Optional;
 
@@ -195,9 +194,11 @@ public class WebSocketCloseStatus {
    * @param code Status code.
    * @param reason Reason.
    */
-  public WebSocketCloseStatus(int code, @Nonnull String reason) {
+  public WebSocketCloseStatus(int code, @Nullable String reason) {
     this.code = code;
-    this.reason = reason;
+    if (reason != null && reason.length() > 0) {
+      this.reason = reason;
+    }
   }
 
   /**

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -335,7 +335,7 @@ public Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder en
   }
 
   @Nonnull @Override public Route ws(@Nonnull String pattern, @Nonnull WebSocket.Initializer handler) {
-    return route(GET, pattern, new WebSocketHandler(handler));
+    return route(WS, pattern, new WebSocketHandler(handler));
   }
 
   @Override
@@ -389,13 +389,20 @@ private Route defineRoute(@Nonnull String method, @Nonnull String pattern,
     String routePattern = normalizePath(basePath == null
         ? safePattern
         : basePath + safePattern, false, true);
-    tree.insert(route.getMethod(), routePattern, route);
-    if (route.isHttpOptions()) {
-      tree.insert(Router.OPTIONS, routePattern, route);
-    } else if (route.isHttpTrace()) {
-      tree.insert(Router.TRACE, routePattern, route);
-    } else if (route.isHttpHead() && route.getMethod().equals(GET)) {
-      tree.insert(Router.HEAD, routePattern, route);
+
+    if (route.getMethod().equals(WS)) {
+      tree.insert(GET, routePattern, route);
+      route.setReturnType(Context.class);
+    } else {
+      tree.insert(route.getMethod(), routePattern, route);
+
+      if (route.isHttpOptions()) {
+        tree.insert(Router.OPTIONS, routePattern, route);
+      } else if (route.isHttpTrace()) {
+        tree.insert(Router.TRACE, routePattern, route);
+      } else if (route.isHttpHead() && route.getMethod().equals(GET)) {
+        tree.insert(Router.HEAD, routePattern, route);
+      }
     }
     routes.add(route);
 

jooby/src/main/java/io/jooby/internal/handler/WebSocketHandler.java

@@ -18,9 +18,11 @@ public WebSocketHandler(WebSocket.Initializer handler) {
     boolean webSocket = ctx.header("Upgrade").value("")
         .equalsIgnoreCase("WebSocket");
     if (webSocket) {
-      return ctx.upgrade(handler);
-    } else {
+      ctx.upgrade(handler);
+    }
+    if (!ctx.isResponseStarted()) {
       return ctx.send(StatusCode.NOT_FOUND);
     }
+    return ctx;
   }
 }

modules/jooby-jetty/pom.xml

@@ -31,6 +31,11 @@
       <artifactId>jetty-server</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-server</artifactId>
+    </dependency>
+
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>