Merge branch 'dev' of https://gitee.com/opensolon/solon-jakarta into dev

Author: noear

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/websocket/TcWebSocketConfigurator.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2017-2025 noear.org and authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.noear.solon.server.tomcat.websocket;
+
+import java.util.List;
+import java.util.Map;
+
+import org.noear.solon.Utils;
+import org.noear.solon.net.websocket.SubProtocolCapable;
+import org.noear.solon.net.websocket.WebSocketRouter;
+import org.noear.solon.server.util.DecodeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
+
+/**
+ * Tomcat WebSocket 配置器
+ * 
+ * @author 小xu中年
+ * @since 3.7.3
+ */
+public class TcWebSocketConfigurator extends ServerEndpointConfig.Configurator {
+    private static final Logger log = LoggerFactory.getLogger(TcWebSocketConfigurator.class);
+    
+    @Override
+    public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
+        // 存储握手请求信息，供后续使用
+        sec.getUserProperties().put("handshakeRequest", request);
+        
+        // 处理子协议协商
+        String path = DecodeUtils.rinseUri(request.getRequestURI().getPath());
+        SubProtocolCapable subProtocolCapable = WebSocketRouter.getInstance().getSubProtocol(path);
+        
+        if (subProtocolCapable != null) {
+            List<String> clientProtocols = request.getHeaders().get("Sec-WebSocket-Protocol");
+            if (clientProtocols != null && !clientProtocols.isEmpty()) {
+                String protocols = subProtocolCapable.getSubProtocols(clientProtocols);
+                
+                if (Utils.isNotEmpty(protocols)) {
+                    response.getHeaders().put("Sec-WebSocket-Protocol", List.of(protocols));
+                }
+            }
+        }
+        
+        // 存储请求头信息
+        for (Map.Entry<String, List<String>> entry : request.getHeaders().entrySet()) {
+            if (!entry.getValue().isEmpty()) {
+                sec.getUserProperties().put("header." + entry.getKey(), entry.getValue().get(0));
+            }
+        }
+    }
+    
+    @Override
+    public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException {
+        try {
+            return endpointClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            log.error("Tomcat WebSocket Failed to create endpoint instance: {}", endpointClass.getName(), e);
+            throw new InstantiationException("Tomcat WebSocket Failed to create endpoint instance: " + e.getMessage());
+        }
+    }
+}

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/websocket/TcWebSocketEndpoint.java

@@ -30,16 +30,23 @@
  * Tomcat WebSocket端点实现
  *
  * @author 小xu中年
- * @since 3.7
+ * @since 3.7.3
  */
 public class TcWebSocketEndpoint extends Endpoint {
-    private final String SESSION_KEY = "session";
+    private final String SESSION_KEY = "session"; 
     private static final WebSocketRouter webSocketRouter = WebSocketRouter.getInstance();
 
     @Override
     public void onOpen(Session session, EndpointConfig endpointConfig) {
+        // 设置最大消息大小，与Jetty保持一致
+        session.setMaxTextMessageBufferSize(17_000_000);
+        session.setMaxBinaryMessageBufferSize(17_000_000);
+        
+        // 创建WebSocket实例
         WebSocket socket = new WebSocketImpl(session);
         session.getUserProperties().put(SESSION_KEY, socket);
+        
+        // 注册消息处理器
         session.addMessageHandler(new BufferMessageHandler(socket));
         session.addMessageHandler(new TextMessageHandler(socket));
 
@@ -71,9 +78,9 @@ public TextMessageHandler(WebSocket socket) {
         }
 
         @Override
-        public void onMessage(String s) {
+        public void onMessage(String text) {
             try {
-                webSocketRouter.getListener().onMessage(socket, s);
+                webSocketRouter.getListener().onMessage(socket, text);
             } catch (Throwable e) {
                 webSocketRouter.getListener().onError(socket, e);
             }
@@ -88,9 +95,9 @@ public BufferMessageHandler(WebSocket socket) {
         }
 
         @Override
-        public void onMessage(ByteBuffer s) {
+        public void onMessage(ByteBuffer buffer) {
             try {
-                webSocketRouter.getListener().onMessage(socket, s);
+                webSocketRouter.getListener().onMessage(socket, buffer);
             } catch (Throwable e) {
                 webSocketRouter.getListener().onError(socket, e);
             }

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/websocket/TcWebSocketManager.java

@@ -28,22 +28,26 @@
 
 /**
  * Tomcat WebSocket 管理器
- *
+ * 
  * @author 小xu中年
- * @since 3.7
+ * @since 3.7.3
  */
 public class TcWebSocketManager {
     private static final Logger log = LoggerFactory.getLogger(TcWebSocketManager.class);
+    private static boolean enableWebSocket = false;
 
     private TcWebSocketManager() {}
 
-    private static boolean enableWebSocket = false;
-    
     /**
      * 在Tomcat上下文中初始化WebSocket支持
      * 注意：此方法需要在上下文初始化之前调用
      */
     public static void init(Context context) {
+        if (context == null) {
+            log.error("Tomcat Context is null, cannot initialize WebSocket");
+            return;
+        }
+        
         try {
             // 注册WebSocket容器初始化器
             context.addServletContainerInitializer(new WsSci(), null);
@@ -59,39 +63,57 @@ public static void init(Context context) {
      * 注意：此方法需要在服务器启动后调用
      */
     public static void registerEndpoints(Context context) {
+        if (context == null) {
+            log.error("Tomcat Context is null, cannot register WebSocket endpoints");
+            return;
+        }
+        
         try {
-        	if (context == null) {
-                log.error("Tomcat Context is null, cannot register WebSocket endpoints");
-                return;
-            }
             // 获取ServerContainer
             ServerContainer serverContainer = (ServerContainer) context.getServletContext()
                     .getAttribute("jakarta.websocket.server.ServerContainer");
 
             if (serverContainer == null) {
-                throw new IllegalStateException("Missing jakarta.websocket.server.ServerContainer");
+                log.error("Tomcat Context Missing jakarta.websocket.server.ServerContainer");
+                return;
             }
 
             // 获取所有注册的路径
             Collection<String> paths = WebSocketRouter.getInstance().getPaths();
 
             for (String path : paths) {
                 if (path.startsWith("/")) {
+                    // 使用自定义配置器创建端点配置
                     ServerEndpointConfig endpointConfig = ServerEndpointConfig.Builder
                             .create(TcWebSocketEndpoint.class, path)
+                            .configurator(new TcWebSocketConfigurator())
                             .build();
+                    
                     serverContainer.addEndpoint(endpointConfig);
                     log.info("Tomcat Registered WebSocket endpoint: {}", path);
                 }
             }
         } catch (Throwable e) {
-            log.error("Failed to register WebSocket endpoints", e);
-            throw new RuntimeException(e);
+            log.error("Failed to register Tomcat WebSocket endpoints", e);
         }
     }
 
-	public static boolean isEnableWebSocket() {
-		return enableWebSocket;
-	}
+    /**
+     * 检查WebSocket是否已启用
+     */
+    public static boolean isEnableWebSocket() {
+        return enableWebSocket;
+    }
 
+    /**
+     * 获取WebSocket容器
+     */
+//    public static ServerContainer getServerContainer(Context context) {
+//        if (context == null) {
+//            return null;
+//        }
+//        
+//        return (ServerContainer) context.getServletContext()
+//                .getAttribute("jakarta.websocket.server.ServerContainer");
+//    }
 }

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

@@ -15,33 +15,49 @@
  */
 package org.noear.solon.server.tomcat.websocket;
 
-import jakarta.websocket.CloseReason;
-import jakarta.websocket.Session;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.concurrent.Future;
+
 import org.noear.solon.net.websocket.WebSocketBase;
+import org.noear.solon.server.util.DecodeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.concurrent.Future;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Session;
 
 /**
- *
- * @author 小xu中年
- * @since 3.7
- * */
+ * Tomcat WebSocket 实现
+ * 
+ * @author noear
+ * @since 3.7.3
+ */
 public class WebSocketImpl extends WebSocketBase {
     private static final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
-    private Session real;
+    private final Session real;
 
     public WebSocketImpl(Session real) {
         this.real = real;
-        this.init(real.getRequestURI());
+        String uri = DecodeUtils.rinseUri(real.getRequestURI().toString());
+        this.init(URI.create(uri));
+        
+        // 从会话属性中获取请求头信息
+        for (String key : real.getUserProperties().keySet()) {
+            if (key.startsWith("header.")) {
+                String headerName = key.substring(7); // 移除"header."前缀
+                Object value = real.getUserProperties().get(key);
+                if (value instanceof String) {
+                    this.param(headerName, (String) value);
+                }
+            }
+        }
     }
 
     @Override
     public boolean isValid() {
-        return isClosed() == false && real.isOpen();
+        return !isClosed() && real.isOpen();
     }
 
     @Override
@@ -51,13 +67,11 @@ public boolean isSecure() {
 
     @Override
     public InetSocketAddress remoteAddress() {
-        // Tomcat的Session不直接提供远程地址，这里返回null
         return null;
     }
 
     @Override
     public InetSocketAddress localAddress() {
-        // Tomcat的Session不直接提供本地地址，这里返回null
         return null;
     }