Fixes including - Don't include Content-Length in request (#25)

Author: adam-fowler

Sources/WSClient/Client/URI.swift

@@ -14,7 +14,7 @@
 
 /// Simple URL parser
 struct URI: Sendable, CustomStringConvertible, ExpressibleByStringLiteral {
-    struct Scheme: RawRepresentable, Equatable {
+    struct Scheme: RawRepresentable, Equatable, CustomStringConvertible {
         let rawValue: String
 
         init(rawValue: String) {
@@ -28,6 +28,8 @@ struct URI: Sendable, CustomStringConvertible, ExpressibleByStringLiteral {
         static var https_unix: Self { .init(rawValue: "https_unix") }
         static var ws: Self { .init(rawValue: "ws") }
         static var wss: Self { .init(rawValue: "wss") }
+
+        var description: String { self.rawValue }
     }
 
     let string: String

Sources/WSClient/WebSocketClient.swift

@@ -163,7 +163,7 @@ public struct WebSocketClient {
                             configuration: self.configuration
                         ),
                         tlsConfiguration: TLSConfiguration.makeClientConfiguration(),
-                        serverHostname: host
+                        serverHostname: self.configuration.sniHostname ?? host
                     ),
                     address: .hostname(host, port: port),
                     eventLoopGroup: self.eventLoopGroup,

Sources/WSClient/WebSocketClientChannel.swift

@@ -30,12 +30,14 @@ struct WebSocketClientChannel: ClientConnectionChannel {
 
     let urlPath: String
     let hostHeader: String
+    let originHeader: String
     let handler: WebSocketDataHandler<WebSocketClient.Context>
     let configuration: WebSocketClientConfiguration
 
     init(handler: @escaping WebSocketDataHandler<WebSocketClient.Context>, url: URI, configuration: WebSocketClientConfiguration) throws {
-        guard let hostHeader = Self.urlHostHeader(for: url) else { throw WebSocketClientError.invalidURL }
+        guard let (hostHeader, originHeader) = Self.urlHostAndOriginHeaders(for: url) else { throw WebSocketClientError.invalidURL }
         self.hostHeader = hostHeader
+        self.originHeader = originHeader
         self.urlPath = Self.urlPath(for: url)
         self.handler = handler
         self.configuration = configuration
@@ -63,8 +65,8 @@ struct WebSocketClientChannel: ClientConnectionChannel {
             )
 
             var headers = HTTPHeaders()
-            headers.add(name: "Content-Length", value: "0")
-            headers.add(name: "Host", value: self.hostHeader)
+            headers.replaceOrAdd(name: "Host", value: self.hostHeader)
+            headers.replaceOrAdd(name: "Origin", value: self.originHeader)
             let additionalHeaders = HTTPHeaders(self.configuration.additionalHeaders)
             headers.add(contentsOf: additionalHeaders)
             // add websocket extensions to headers
@@ -128,12 +130,13 @@ struct WebSocketClientChannel: ClientConnectionChannel {
         url.path + (url.query.map { "?\($0)" } ?? "")
     }
 
-    static func urlHostHeader(for url: URI) -> String? {
-        guard let host = url.host else { return nil }
+    static func urlHostAndOriginHeaders(for url: URI) -> (host: String, origin: String)? {
+        guard let scheme = url.scheme, let host = url.host else { return nil }
+        let origin = "\(scheme)://\(host)"
         if let port = url.port {
-            return "\(host):\(port)"
+            return (host: "\(host):\(port)", origin: origin)
         } else {
-            return host
+            return (host: host, origin: origin)
         }
     }
 }

Tests/WebSocketTests/ClientChannelTests.swift

@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Hummingbird server framework project
+//
+// Copyright (c) 2025 the Hummingbird authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See hummingbird/CONTRIBUTORS.txt for the list of Hummingbird authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import Logging
+import XCTest
+
+@testable import WSClient
+
+final class ClientChannelTests: XCTestCase {
+
+    func testInitialRequestHeader() async throws {
+        let ws = try WebSocketClientChannel(handler: { _, _, _ in }, url: "wss://echo.websocket.org:443/ws", configuration: .init())
+
+        XCTAssertEqual(ws.urlPath, "/ws")
+        XCTAssertEqual(ws.hostHeader, "echo.websocket.org:443")
+        XCTAssertEqual(ws.originHeader, "wss://echo.websocket.org")
+    }
+}