添加 solon-net WebSocket:colse(code,reason) 方法及相关适配

Author: noear

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/server/jetty/websocket/WebSocketImpl.java

@@ -18,10 +18,10 @@
 import org.eclipse.jetty.websocket.api.Callback;
 import org.eclipse.jetty.websocket.api.Session;
 import org.noear.solon.server.util.DecodeUtils;
-import org.noear.solon.core.util.RunUtil;
 import org.noear.solon.net.websocket.WebSocketBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.nio.ByteBuffer;
@@ -33,6 +33,7 @@
  * @since 2.6
  */
 public class WebSocketImpl extends WebSocketBase {
+    private static final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
     private final Session real;
 
     public WebSocketImpl(Session real) {
@@ -89,6 +90,25 @@ public Future<Void> send(ByteBuffer binary) {
     @Override
     public void close() {
         super.close();
-        RunUtil.runAndTry(real::close);
+
+        if (real.isOpen()) {
+            real.close();
+        }
+    }
+
+    @Override
+    public void close(int code, String reason) {
+        super.close(code, reason);
+
+        if (real.isOpen()) {
+            real.close(code, reason, new Callback() {
+                @Override
+                public void fail(Throwable ignore) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Close failure: {}", ignore.getMessage());
+                    }
+                }
+            });
+        }
     }
 }

solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/main/java/org/noear/solon/server/undertow/websocket/WebSocketImpl.java

@@ -18,8 +18,9 @@
 import io.undertow.websockets.core.WebSocketChannel;
 import io.undertow.websockets.core.WebSockets;
 import org.noear.solon.server.util.DecodeUtils;
-import org.noear.solon.core.util.RunUtil;
 import org.noear.solon.net.websocket.WebSocketBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -31,6 +32,7 @@
  * @since 2.6
  */
 public class WebSocketImpl extends WebSocketBase {
+    private static final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
     private WebSocketChannel real;
 
     public WebSocketImpl(WebSocketChannel real) {
@@ -92,7 +94,30 @@ public void close() {
         super.close();
 
         if (real.isOpen()) {
-            RunUtil.runAndTry(real::close);
+            try {
+                real.close();
+            } catch (Throwable ignore) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Close failure: {}", ignore.getMessage());
+                }
+            }
         }
     }
-}
+
+    @Override
+    public void close(int code, String reason) {
+        super.close(code, reason);
+
+        if (real.isOpen()) {
+            try {
+                real.setCloseCode(code);
+                real.setCloseReason(reason);
+                real.close();
+            } catch (Throwable ignore) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Close failure: {}", ignore.getMessage());
+                }
+            }
+        }
+    }
+}