will of D

Author: SentryMan

avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/JexWebSocket.java renamed to avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/DWebSocket.java

@@ -10,12 +10,12 @@
 import io.avaje.jex.websocket.exception.CloseCode;
 import io.avaje.jex.websocket.internal.AbstractWebSocket;
 
-class JexWebSocket extends AbstractWebSocket {
+class DWebSocket extends AbstractWebSocket {
 
   private final WebSocketListener listener;
   private final Context ctx;
 
-  JexWebSocket(Context ctx, WebSocketListener listener) {
+  DWebSocket(Context ctx, WebSocketListener listener) {
     super(ctx.exchange());
     this.listener = listener;
     this.ctx = ctx;

avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/WebSocketExchangeHandler.java renamed to avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/DWebSocketHandler.java

@@ -3,17 +3,17 @@
 import io.avaje.jex.http.Context;
 import io.avaje.jex.websocket.internal.WebSocketHandler;
 
-class WebSocketExchangeHandler extends WebSocketHandler {
+class DWebSocketHandler extends WebSocketHandler {
 
   private final WebSocketListener listener;
 
-  WebSocketExchangeHandler(WebSocketListener listener) {
+  DWebSocketHandler(WebSocketListener listener) {
     this.listener = listener;
   }
 
   @Override
-  protected JexWebSocket openWebSocket(Context exchange) {
+  protected DWebSocket openWebSocket(Context exchange) {
 
-    return new JexWebSocket(exchange, listener);
+    return new DWebSocket(exchange, listener);
   }
 }

avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/WebSocketPlugin.java

@@ -13,7 +13,7 @@ public class WebSocketPlugin implements JexPlugin {
   private final List<Routing.HttpService> handlers = new ArrayList<>();
 
   public WebSocketPlugin ws(String path, WebSocketListener listener, Role... roles) {
-    handlers.add(r -> r.get(path, new WebSocketExchangeHandler(listener), roles));
+    handlers.add(r -> r.get(path, new DWebSocketHandler(listener), roles));
     return this;
   }
 

avaje-jex-websockets/src/main/java/io/avaje/jex/websocket/internal/Util.java

@@ -40,21 +40,13 @@
 class Util {
 
   public static final String HEADER_UPGRADE = "Upgrade";
-
   public static final String HEADER_UPGRADE_VALUE = "websocket";
-
   public static final String HEADER_CONNECTION = "Connection";
-
   public static final String HEADER_WEBSOCKET_VERSION = "sec-websocket-version";
-
   public static final String HEADER_WEBSOCKET_VERSION_VALUE = "13";
-
   public static final String HEADER_WEBSOCKET_KEY = "sec-websocket-key";
-
   public static final String HEADER_WEBSOCKET_ACCEPT = "sec-websocket-accept";
-
   public static final String HEADER_WEBSOCKET_PROTOCOL = "sec-websocket-protocol";
-
   private static final String WEBSOCKET_KEY_MAGIC = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
 
   public static String makeAcceptKey(String key) throws NoSuchAlgorithmException {

avaje-jex-websockets/src/test/java/io/avaje/jex/websocket/internal/EchoWebSocketHandler.java

@@ -1,6 +1,7 @@
 package io.avaje.jex.websocket.internal;
 
 import io.avaje.jex.websocket.WebSocketListener;
+import io.avaje.jex.websocket.WsContext.WsError;
 import io.avaje.jex.websocket.WsContext.WsMessage;
 
 public class EchoWebSocketHandler implements WebSocketListener {
@@ -15,6 +16,11 @@ public void onMessage(WsMessage message) {
       sb = new StringBuilder();
       message.send(msg);
     }
-    message.closeSession();
+    //   message.closeSession();
+  }
+
+  @Override
+  public void onError(WsError wsError) {
+    wsError.error().printStackTrace();
   }
 }

avaje-jex-websockets/src/test/java/io/avaje/jex/websocket/internal/WebSocketClientUtil.java

@@ -54,6 +54,7 @@ public void onError(WebSocket webSocket, Throwable error) {
                     if (onCloseCallback != null) {
                       onCloseCallback.run();
                     }
+                    error.printStackTrace();
                   }
 
                   @Override