fix build issue with swift 5.10 (#6)

Author: johnnzhou

Sources/LCLWebSocket/WebSocket.swift

@@ -410,19 +410,30 @@ public final class WebSocket: Sendable {
         if data.readableBytes == 0 {
             return .success("")
         }
+        
+        func getUTF8String(at index: Int, length: Int) throws -> String {
+            guard let bytes = data.getData(at: data.readerIndex, length: data.readableBytes),
+                let text = String(data: bytes, encoding: .utf8)
+            else {
+                throw LCLWebSocketError.invalidUTF8String
+            }
+            
+            return text
+        }
 
         do {
+            #if compiler(>=6.0)
             if #available(macOS 15, iOS 18, tvOS 18, watchOS 11, *) {
                 let text = try data.getUTF8ValidatedString(at: data.readerIndex, length: data.readableBytes) ?? ""
                 return .success(text)
             } else {
-                guard let bytes = data.getData(at: data.readerIndex, length: data.readableBytes),
-                    let text = String(data: bytes, encoding: .utf8)
-                else {
-                    throw LCLWebSocketError.invalidUTF8String
-                }
+                let text = try getUTF8String(at: data.readerIndex, length: data.readableBytes)
                 return .success(text)
             }
+            #else
+            let text = try getUTF8String(at: data.readerIndex, length: data.readableBytes)
+            return .success(text)
+            #endif
 
         } catch {
             return .failure(error)
@@ -544,7 +555,7 @@ extension WebSocket {
 extension WebSocket {
 
     /// A collection of information that the WebSocket uses to make the connection
-    public struct ConnectionInfo: Sendable {
+    public struct ConnectionInfo {
 
         /// The URL that the WebSocket client connects to
         let url: URLComponents?
@@ -558,3 +569,7 @@ extension WebSocket {
         }
     }
 }
+
+#if compiler(>=6.0)
+extension WebSocket.ConnectionInfo: Sendable { }
+#endif

Sources/LCLWebSocket/WebSocketHandler.swift

@@ -150,11 +150,20 @@ final class WebSocketHandler: ChannelDuplexHandler {
             default:
                 self.websocket.handleFrame(frame)
             }
-        } catch LCLWebSocketError.invalidUTF8String, is ByteBuffer.ReadUTF8ValidationError {
+        } catch LCLWebSocketError.invalidUTF8String {
             self.websocket.close(code: .dataInconsistentWithMessage, promise: nil)
             context.close(mode: .all, promise: nil)
             clearBufferedFrames()
         } catch {
+            #if compiler(>=6.0)
+            if error is ByteBuffer.ReadUTF8ValidationError {
+                self.websocket.close(code: .dataInconsistentWithMessage, promise: nil)
+                context.close(mode: .all, promise: nil)
+                clearBufferedFrames()
+                return
+            }
+            #endif
+            
             let reason = (error as? LCLWebSocketError)?.description
             self.websocket.close(code: .protocolError, reason: reason, promise: nil)
             context.close(mode: .all, promise: nil)

Tests/IntegrationTests/autobahn/scripts/run_client.sh

@@ -7,7 +7,7 @@ ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 # Define volumes
 CONFIG_DIR="$ROOT_DIR/configs"
 REPORTS_DIR="$ROOT_DIR/reports"
-SERVER_PORT=9002
+FUZZING_CLIENT_NAME="fuzzingclient"
 
 echo $CONFIG_DIR
 echo $REPORTS_DIR
@@ -54,7 +54,23 @@ if [ "${#test_cases[@]}" -ne "${#json_files[@]}" ] || [ "${#test_cases[@]}" -ne
   exit 1
 fi
 
-# Example usage: loop over the array and print each test case
+cleanup() {
+    echo "Cleaning up..."
+
+    # Loop through all the possible server ports and kill processes bound to them
+    for port in "${server_ports[@]}"; do
+        # Check if a process is bound to this port
+        server_pid=$(lsof -n -i :$port -t)
+        if [ -n "$server_pid" ]; then
+            echo "Killing process with PID $server_pid on port $port..."
+            kill -9 "$server_pid" &>/dev/null || true
+        else
+            echo "No process found on port $port."
+        fi
+    done
+}
+trap cleanup EXIT
+
 for i in "${!test_cases[@]}"; do
     test_case=${test_cases[$i]}
     json_file=${json_files[$i]}
@@ -66,7 +82,7 @@ for i in "${!test_cases[@]}"; do
 
 
     # Run the server in the background
-     swift test -c release --filter "$test_case" &> "$log_file" &
+    swift test -c release --filter "$test_case" &> "$log_file" &
 
     # Wait for the server to bind to the port
     timeout=30  # Max wait time for the server to start
@@ -95,14 +111,20 @@ for i in "${!test_cases[@]}"; do
 
     sleep 2
 
-    docker run -it --rm \
+    docker run -d --rm \
     -v "$CONFIG_DIR:/config" \
     -v "$REPORTS_DIR:/reports" \
     -p 9001:9001 \
-    --name fuzzingclient \
-    crossbario/autobahn-testsuite wstest --mode fuzzingclient --spec /config/$json_file
+    --name "$FUZZING_CLIENT_NAME" \
+    crossbario/autobahn-testsuite wstest --mode fuzzingclient --spec /config/$json_file &
+    
+    sleep 2
+    docker_id=$(docker ps -q --filter "name=$FUZZING_CLIENT_NAME")
+    echo "Docker client started with ID: $docker_id"
+    
+    docker wait "$docker_id"
 
-    kill -9 $PID
+    kill -9 $PID &>/dev/null || true
 
     echo "=========================== Test $test_case Done ============================"
     sleep 5

Tests/IntegrationTests/autobahn/scripts/run_server.sh

@@ -7,14 +7,26 @@ ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 # Define volumes
 CONFIG_DIR="$ROOT_DIR/configs"
 REPORTS_DIR="$ROOT_DIR/reports"
+FUZZING_SERVER_NAME="fuzzingserver"
 
 echo $CONFIG_DIR
 echo $REPORTS_DIR
 
+
 # Run Docker container
-docker run -it --rm \
+docker run -d --rm \
     -v "$CONFIG_DIR:/config" \
     -v "$REPORTS_DIR:/reports" \
     -p 9001:9001 \
-    --name fuzzingserver \
-    crossbario/autobahn-testsuite wstest --mode fuzzingserver --spec /config/fuzzingserver.json
+    --name "$FUZZING_SERVER_NAME" \
+    crossbario/autobahn-testsuite wstest --mode fuzzingserver --spec /config/fuzzingserver.json &
+
+echo "waiting for server to be ready"
+sleep 5
+
+swift test -c release --filter IntegrationTests.AutobahnClientTest
+
+docker logs $FUZZING_SERVER_NAME > "$FUZZING_SERVER_NAME.log" 
+
+FUZZING_SERVER_ID=$(docker ps -f "name=$FUZZING_SERVER_NAME" --format "{{.ID}}")
+docker stop $FUZZING_SERVER_ID