完善 solon-server-jetty-jakarta 适

Author: noear

solon-jakarta-parent/pom.xml

@@ -27,7 +27,7 @@
 
         <cxf.version>4.1.2</cxf.version>
 
-        <jetty.version>12.1.0</jetty.version>
+        <jetty.jakarta.version>12.1.1</jetty.jakarta.version>
     </properties>
 
     <dependencyManagement>

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/pom.xml

@@ -21,19 +21,19 @@
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-webapp</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-apache-jsp</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-glassfish-jstl</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
     </dependencies>
 

solon-jakarta-projects/solon-server/solon-server-jetty-add-websocket-jakarta/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>jetty-websocket-jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
     </dependencies>
 

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/pom.xml

@@ -43,42 +43,42 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-servlet</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
         </dependency>
 
         <!-- jetty web socket -->
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>jetty-websocket-jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- jetty jsp -->
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-webapp</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-apache-jsp</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-glassfish-jstl</artifactId>
-            <version>${jetty.version}</version>
+            <version>${jetty.jakarta.version}</version>
             <scope>provided</scope>
         </dependency>
 

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServer.java

@@ -22,7 +22,7 @@
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
 import org.noear.solon.boot.ServerLifecycle;
-import org.noear.solon.boot.jetty.websocket.WebSocketCreatorImpl;
+import org.noear.solon.boot.jetty.websocket.WebSocketConfigurator;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.util.ClassUtil;
 
@@ -74,15 +74,15 @@ protected void setup(String host, int port) throws IOException {
         }
 
         ServletContextHandler contextHandler = buildHandler();
-        real.setHandler(contextHandler);
+
 
         if (enableWebSocket && ClassUtil.hasClass(() -> UpgradeRequest.class)) {
-            //real.setHandler(new HandlerHub(buildHandler()));
-            WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler);
-            wsHandler.getServerWebSocketContainer().addMapping("/*", new WebSocketCreatorImpl());
-            //real.setHandler(wsHandler);
+            WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler, new WebSocketConfigurator());
+            contextHandler.setHandler(wsHandler);
         }
 
+        real.setHandler(contextHandler);
+
         //1.1:分发事件（充许外部扩展）
         EventBus.publish(real);
     }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2017-2024 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.boot.jetty.websocket;
+
+import org.eclipse.jetty.websocket.server.ServerWebSocketContainer;
+
+import java.util.function.Consumer;
+
+/**
+ * WebSocket 配置器
+ *
+ * @author noear
+ * @since 3.5
+ */
+public class WebSocketConfigurator implements Consumer<ServerWebSocketContainer> {
+
+    @Override
+    public void accept(ServerWebSocketContainer serverWebSocketContainer) {
+        serverWebSocketContainer.addMapping("/*", new WebSocketCreatorImpl());
+    }
+}

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

@@ -15,9 +15,6 @@
  */
 package org.noear.solon.boot.jetty.websocket;
 
-//import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-//import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-//import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.server.ServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.ServerUpgradeResponse;
@@ -36,18 +33,23 @@
 public class WebSocketCreatorImpl implements WebSocketCreator {
     private final WebSocketRouter webSocketRouter = WebSocketRouter.getInstance();
 
-
     @Override
     public Object createWebSocket(ServerUpgradeRequest serverUpgradeRequest, ServerUpgradeResponse serverUpgradeResponse, Callback callback) throws Exception {
         //添加子协议支持
-        String path = DecodeUtils.rinseUri(serverUpgradeRequest.getHttpURI().getPath());
-        SubProtocolCapable subProtocolCapable = webSocketRouter.getSubProtocol(path);
-        if (subProtocolCapable != null) {
-            String protocols = subProtocolCapable.getSubProtocols(serverUpgradeRequest.getSubProtocols());
+        try {
+            String path = DecodeUtils.rinseUri(serverUpgradeRequest.getHttpURI().getPath());
+            SubProtocolCapable subProtocolCapable = webSocketRouter.getSubProtocol(path);
+            if (subProtocolCapable != null) {
+                String protocols = subProtocolCapable.getSubProtocols(serverUpgradeRequest.getSubProtocols());
 
-            if (Utils.isNotEmpty(protocols)) {
-                serverUpgradeResponse.setAcceptedSubProtocol(protocols);
+                if (Utils.isNotEmpty(protocols)) {
+                    serverUpgradeResponse.setAcceptedSubProtocol(protocols);
+                }
             }
+
+            callback.succeeded();
+        } catch (Exception ex) {
+            callback.failed(ex);
         }
 
         return new WebSocketListenerImpl();

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

@@ -24,7 +24,13 @@
 
 import java.nio.ByteBuffer;
 
-public class WebSocketListenerImpl implements Session.Listener {
+/**
+ * WebSokcet 监听器
+ *
+ * @author noear
+ * @since 3.5
+ * */
+public class WebSocketListenerImpl implements Session.Listener.AutoDemanding {
     static final Logger log = LoggerFactory.getLogger(WebSocketListenerImpl.class);
 
     private WebSocketImpl webSocket;
@@ -64,14 +70,20 @@ public void onWebSocketText(String text) {
     }
 
     @Override
-    public void onWebSocketClose(int statusCode, String reason) {
-        if (webSocket.isClosed()) {
-            return;
-        } else {
-            RunUtil.runAndTry(webSocket::close);
-        }
+    public void onWebSocketClose(int statusCode, String reason, Callback callback) {
+        try {
+            if (webSocket.isClosed()) {
+                return;
+            } else {
+                RunUtil.runAndTry(webSocket::close);
+            }
 
-        webSocketRouter.getListener().onClose(webSocket);
+            webSocketRouter.getListener().onClose(webSocket);
+            callback.succeed();
+        } catch (Throwable e) {
+            log.warn(e.getMessage(), e);
+            callback.fail(e);
+        }
     }
 
     @Override