Update for non-generic HTTPChannelBuilder (#59)

* Update for non-generic HTTPChannelBuilder * Update for HB 2.0 beta 3 * Use 2.0.0 beta 4
hummingbird-project · Apr 29, 2024 · 81cda8c · 81cda8c
1 parent 1b9bdfc
commit 81cda8c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Package.swift b/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "HummingbirdWSCompression", targets: ["HummingbirdWSCompression"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.2"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-beta.4"),
         .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.62.0"),

diff --git a/Sources/HummingbirdWebSocket/WebSocketHTTPChannelBuilder.swift b/Sources/HummingbirdWebSocket/WebSocketHTTPChannelBuilder.swift
@@ -26,7 +26,7 @@ extension HTTPChannelBuilder {
         configuration: WebSocketServerConfiguration = .init(),
         additionalChannelHandlers: @autoclosure @escaping @Sendable () -> [any RemovableChannelHandler] = [],
         shouldUpgrade: @escaping @Sendable (HTTPRequest, Channel, Logger) async throws -> ShouldUpgradeResult<WebSocketDataHandler<BasicWebSocketContext>>
-    ) -> HTTPChannelBuilder<HTTP1WebSocketUpgradeChannel> {
+    ) -> HTTPChannelBuilder {
         return .init { responder in
             return HTTP1WebSocketUpgradeChannel(
                 responder: responder,
@@ -42,7 +42,7 @@ extension HTTPChannelBuilder {
         configuration: WebSocketServerConfiguration = .init(),
         additionalChannelHandlers: @autoclosure @escaping @Sendable () -> [any RemovableChannelHandler] = [],
         shouldUpgrade: @escaping @Sendable (HTTPRequest, Channel, Logger) throws -> ShouldUpgradeResult<WebSocketDataHandler<BasicWebSocketContext>>
-    ) -> HTTPChannelBuilder<HTTP1WebSocketUpgradeChannel> {
+    ) -> HTTPChannelBuilder {
         return .init { responder in
             return HTTP1WebSocketUpgradeChannel(
                 responder: responder,

diff --git a/Sources/HummingbirdWebSocket/WebSocketRouter.swift b/Sources/HummingbirdWebSocket/WebSocketRouter.swift
@@ -213,7 +213,7 @@ extension HTTPChannelBuilder {
         webSocketRouter: WSResponderBuilder,
         configuration: WebSocketServerConfiguration = .init(),
         additionalChannelHandlers: @autoclosure @escaping @Sendable () -> [any RemovableChannelHandler] = []
-    ) -> HTTPChannelBuilder<HTTP1WebSocketUpgradeChannel> where WSResponderBuilder.Responder.Context: WebSocketRequestContext {
+    ) -> HTTPChannelBuilder where WSResponderBuilder.Responder.Context: WebSocketRequestContext {
         let webSocketReponder = webSocketRouter.buildResponder()
         return .init { responder in
             return HTTP1WebSocketUpgradeChannel(

diff --git a/Tests/HummingbirdWebSocketTests/WebSocketExtensionTests.swift b/Tests/HummingbirdWebSocketTests/WebSocketExtensionTests.swift
@@ -26,7 +26,7 @@ import XCTest
 
 final class HummingbirdWebSocketExtensionTests: XCTestCase {
     func testClientAndServer(
-        serverChannel: HTTPChannelBuilder<HTTP1WebSocketUpgradeChannel>,
+        serverChannel: HTTPChannelBuilder,
         clientExtensions: [WebSocketExtensionFactory] = [],
         client clientHandler: @escaping WebSocketDataHandler<BasicWebSocketContext>
     ) async throws {

diff --git a/Tests/HummingbirdWebSocketTests/WebSocketTests.swift b/Tests/HummingbirdWebSocketTests/WebSocketTests.swift
@@ -77,7 +77,7 @@ final class HummingbirdWebSocketTests: XCTestCase {
     }
 
     @discardableResult func testClientAndServer(
-        serverChannel: HTTPChannelBuilder<some HTTPChannelHandler>,
+        serverChannel: HTTPChannelBuilder,
         getClient: @escaping @Sendable (Int, Logger) throws -> WebSocketClient
     ) async throws -> WebSocketCloseFrame? {
         try await withThrowingTaskGroup(of: Void.self) { group in
@@ -129,7 +129,7 @@ final class HummingbirdWebSocketTests: XCTestCase {
         shouldUpgrade: @escaping @Sendable (HTTPRequest) throws -> HTTPFields? = { _ in return [:] },
         getClient: @escaping @Sendable (Int, Logger) throws -> WebSocketClient
     ) async throws -> WebSocketCloseFrame? {
-        let webSocketUpgrade: HTTPChannelBuilder<some HTTPChannelHandler> = .http1WebSocketUpgrade { head, _, _ in
+        let webSocketUpgrade: HTTPChannelBuilder = .http1WebSocketUpgrade { head, _, _ in
             if let headers = try shouldUpgrade(head) {
                 return .upgrade(headers, serverHandler)
             } else {
@@ -173,7 +173,7 @@ final class HummingbirdWebSocketTests: XCTestCase {
         webSocketRouter: Router<some WebSocketRequestContext>,
         getClient: @escaping @Sendable (Int, Logger) throws -> WebSocketClient
     ) async throws -> WebSocketCloseFrame? {
-        let webSocketUpgrade: HTTPChannelBuilder<some HTTPChannelHandler> = .http1WebSocketUpgrade(webSocketRouter: webSocketRouter)
+        let webSocketUpgrade: HTTPChannelBuilder = .http1WebSocketUpgrade(webSocketRouter: webSocketRouter)
         return try await self.testClientAndServer(
             serverChannel: webSocketUpgrade,
             getClient: getClient
@@ -540,7 +540,7 @@ final class HummingbirdWebSocketTests: XCTestCase {
         router.ws("/ws") { inbound, _, _ in
             for try await _ in inbound {}
         }
-        let webSocketUpgrade: HTTPChannelBuilder<some HTTPChannelHandler> = .http1WebSocketUpgrade(
+        let webSocketUpgrade: HTTPChannelBuilder = .http1WebSocketUpgrade(
             webSocketRouter: router,
             configuration: .init(autoPing: .enabled(timePeriod: .milliseconds(50)))
         )