Scx Http Peach 支持 WebSocket (#119)

scx567888 · Oct 30, 2024 · f7e01e4 · f7e01e4
1 parent 8491606
commit f7e01e4
Show file tree

Hide file tree

Showing 40 changed files with 651 additions and 79 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>scx</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.9</version>
+    <version>3.1.10</version>
 
     <name>SCX</name>
     <url>https://github.com/scx567888/scx</url>

diff --git a/scx-ansi/pom.xml b/scx-ansi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-ansi</artifactId>

diff --git a/scx-common/pom.xml b/scx-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-common</artifactId>

diff --git a/scx-config/pom.xml b/scx-config/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-config</artifactId>

diff --git a/scx-core/pom.xml b/scx-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-core</artifactId>

diff --git a/scx-core/src/main/java/cool/scx/core/ScxVersion.java b/scx-core/src/main/java/cool/scx/core/ScxVersion.java
@@ -13,7 +13,7 @@ public class ScxVersion {
     /**
      * SCX 版本号
      */
-    public static final String SCX_VERSION = "3.1.9";
+    public static final String SCX_VERSION = "3.1.10";
 
     /**
      * 在控制台上打印 banner

diff --git a/scx-data-jdbc/pom.xml b/scx-data-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-data-jdbc</artifactId>

diff --git a/scx-data-mysql-x/pom.xml b/scx-data-mysql-x/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-data-mysql-x</artifactId>

diff --git a/scx-data/pom.xml b/scx-data/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-data</artifactId>

diff --git a/scx-ext/pom.xml b/scx-ext/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-ext</artifactId>

diff --git a/scx-ffm/pom.xml b/scx-ffm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-ffm</artifactId>

diff --git a/scx-http-helidon/pom.xml b/scx-http-helidon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-http-helidon</artifactId>

diff --git a/scx-http-peach/pom.xml b/scx-http-peach/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cool.scx</groupId>
         <artifactId>scx</artifactId>
-        <version>3.1.9</version>
+        <version>3.1.10</version>
     </parent>
 
     <artifactId>scx-http-peach</artifactId>

diff --git a/scx-http-peach/src/main/java/cool/scx/http/peach/PeachHttpServer.java b/scx-http-peach/src/main/java/cool/scx/http/peach/PeachHttpServer.java
@@ -8,12 +8,13 @@
 import cool.scx.net.ScxTCPServerOptions;
 import cool.scx.net.ScxTCPSocket;
 import cool.scx.net.TCPServer;
+import cool.scx.net.tls.TLS;
 
 import java.net.URLDecoder;
 import java.util.function.Consumer;
 
-import static cool.scx.http.HttpFieldName.CONNECTION;
-import static cool.scx.http.HttpFieldName.SERVER;
+import static cool.scx.http.HttpFieldName.*;
+import static cool.scx.http.HttpMethod.GET;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class PeachHttpServer implements ScxHttpServer {
@@ -26,15 +27,16 @@ public class PeachHttpServer implements ScxHttpServer {
 
     public PeachHttpServer(ScxHttpServerOptions options) {
         this.options = options;
-        this.tcpServer = new TCPServer(new ScxTCPServerOptions().port(options.port()));
-        this.tcpServer.onConnect(this::listen);
+        this.tcpServer = new TCPServer(new ScxTCPServerOptions().port(options.port()).tls((TLS) options.tls()));
+        this.tcpServer.onConnect(this::handle);
     }
 
     public PeachHttpServer() {
         this(new ScxHttpServerOptions());
     }
 
-    private void listen(ScxTCPSocket scxTCPSocket) {
+    private void handle(ScxTCPSocket scxTCPSocket) {
+        //先假定 这是一个 http 1.1 连接
         var dataReader = new LinkedDataReader(new InputStreamDataSupplier(scxTCPSocket.inputStream()));
         while (true) {
             //读取 请求行
@@ -44,24 +46,37 @@ private void listen(ScxTCPSocket scxTCPSocket) {
             if (split.length != 3) {
                 throw new RuntimeException("Invalid request line: " + requestLine);
             }
-            var method = split[0];
-            var path = split[1];
-            var version = split[2];
+            var method0 = split[0];
+            var path0 = split[1];
+            var version0 = split[2];
 
-            var request = new PeachHttpServerRequest();
-
-            request.method = ScxHttpMethod.of(method);
-            request.uri = ScxURI.of(URLDecoder.decode(path, UTF_8));
-            request.version = HttpVersion.of(version);
+            var method = ScxHttpMethod.of(method0);
+            var path = URLDecoder.decode(path0, UTF_8);
+            var version = HttpVersion.of(version0);
 
             var headerBytes = dataReader.readUntil("\r\n\r\n".getBytes());
 
             var headerStr = new String(headerBytes);
 
             var headers = ScxHttpHeaders.of(headerStr);
 
-            request.headers = headers;
+            var connection = headers.get(CONNECTION);
+            var upgrade = headers.get(UPGRADE);
+
+            var isWebSocketHandshake = method == GET && "Upgrade".equals(connection) && "websocket".equals(upgrade);
+
+            PeachHttpServerRequest request;
+
+            if (isWebSocketHandshake) {
+                request = new PeachServerWebSocketHandshakeRequest(dataReader, scxTCPSocket.outputStream());
+            } else {
+                request = new PeachHttpServerRequest();
+            }
 
+            request.method = method;
+            request.uri = ScxURI.of(path);
+            request.version = version;
+            request.headers = headers;
 
             ScxHttpBody body = null;
 
@@ -87,6 +102,16 @@ private void listen(ScxTCPSocket scxTCPSocket) {
                 requestHandler.accept(request);
             }
 
+            //尝试启动 websocket 监听 todo 这里应该重新设计
+            if (request instanceof PeachServerWebSocketHandshakeRequest w) {
+                var ws = w.webSocket;
+                if (ws != null) {
+                    ws.start();
+                }
+                // websocket 独占整个连接 退出循环
+                break;
+            }
+
         }
     }
 

diff --git a/scx-http-peach/src/main/java/cool/scx/http/peach/PeachHttpServerResponse.java b/scx-http-peach/src/main/java/cool/scx/http/peach/PeachHttpServerResponse.java
@@ -43,6 +43,16 @@ public void write(byte[] b, int off, int len) throws IOException {
                 out.write(b, off, len);
             }
 
+            @Override
+            public void flush() throws IOException {
+                out.flush();
+            }
+
+            @Override
+            public void close() throws IOException {
+                checkFirstSend();
+            }
+
         };
     }