Rename HBChannelSetup, HBHTTPChannelSetupBuilder

Sources/Hummingbird/Application.swift

@@ -46,14 +46,14 @@ public protocol HBApplicationProtocol: Service where Context: HBRequestContext {
     /// Responder that generates a response from a requests and context
     associatedtype Responder: HBResponder
     /// Child Channel setup. This defaults to support HTTP1
-    associatedtype ChannelSetup: HBChannelSetup & HTTPChannelHandler = HTTP1Channel
+    associatedtype ChildChannel: HBChildChannel & HTTPChannelHandler = HTTP1Channel
     /// Context passed with HBRequest to responder
     typealias Context = Responder.Context
 
     /// Build the responder
     var responder: Responder { get async throws }
     /// Server channel setup
-    var channelSetup: HBHTTPChannelSetupBuilder<ChannelSetup> { get }
+    var channelSetup: HBHTTPChannelBuilder<ChildChannel> { get }
 
     /// event loop group used by application
     var eventLoopGroup: EventLoopGroup { get }
@@ -69,7 +69,7 @@ public protocol HBApplicationProtocol: Service where Context: HBRequestContext {
 
 extension HBApplicationProtocol {
     /// Server channel setup
-    public var channelSetup: HBHTTPChannelSetupBuilder<HTTP1Channel> { .http1() }
+    public var channelSetup: HBHTTPChannelBuilder<HTTP1Channel> { .http1() }
 }
 
 extension HBApplicationProtocol {
@@ -161,9 +161,9 @@ public func loggerWithRequestId(_ logger: Logger) -> Logger {
 /// try await app.runService()
 /// ```
 /// Editing the application setup after calling `runService` will produce undefined behaviour.
-public struct HBApplication<Responder: HBResponder, ChannelSetup: HBChannelSetup & HTTPChannelHandler>: HBApplicationProtocol where Responder.Context: HBRequestContext {
+public struct HBApplication<Responder: HBResponder, ChildChannel: HBChildChannel & HTTPChannelHandler>: HBApplicationProtocol where Responder.Context: HBRequestContext {
     public typealias Context = Responder.Context
-    public typealias ChannelSetup = ChannelSetup
+    public typealias ChildChannel = ChildChannel
     public typealias Responder = Responder
 
     // MARK: Member variables
@@ -179,7 +179,7 @@ public struct HBApplication<Responder: HBResponder, ChannelSetup: HBChannelSetup
     /// on server running
     private var _onServerRunning: @Sendable (Channel) async -> Void
     /// Server channel setup
-    public let channelSetup: HBHTTPChannelSetupBuilder<ChannelSetup>
+    public let channelSetup: HBHTTPChannelBuilder<ChildChannel>
     /// services attached to the application.
     public var services: [any Service]
 
@@ -188,7 +188,7 @@ public struct HBApplication<Responder: HBResponder, ChannelSetup: HBChannelSetup
     /// Initialize new Application
     public init(
         responder: Responder,
-        channelSetup: HBHTTPChannelSetupBuilder<ChannelSetup> = .http1(),
+        channelSetup: HBHTTPChannelBuilder<ChildChannel> = .http1(),
         configuration: HBApplicationConfiguration = HBApplicationConfiguration(),
         eventLoopGroupProvider: EventLoopGroupProvider = .singleton
     ) {

Sources/HummingbirdCore/Server/ChannelSetup.swift → Sources/HummingbirdCore/Server/ChildChannel.swift

@@ -16,15 +16,15 @@ import Logging
 import NIOCore
 
 /// HTTPServer child channel setup protocol
-public protocol HBChannelSetup: Sendable {
+public protocol HBChildChannel: Sendable {
     associatedtype Value: Sendable
 
     /// Initialize channel
     /// - Parameters:
     ///   - channel: channel
     ///   - childHandlers: Channel handlers to add
     ///   - configuration: server configuration
-    func initialize(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value>
+    func setup(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value>
 
     /// handle async channel
     func handle(value: Value, logger: Logger) async

Sources/HummingbirdCore/Server/HTTP/HTTP1Channel.swift

@@ -18,7 +18,7 @@ import NIOCore
 import NIOHTTPTypes
 import NIOHTTPTypesHTTP1
 
-public struct HTTP1Channel: HBChannelSetup, HTTPChannelHandler {
+public struct HTTP1Channel: HBChildChannel, HTTPChannelHandler {
     public typealias Value = NIOAsyncChannel<HTTPRequestPart, HTTPResponsePart>
 
     public init(
@@ -29,7 +29,7 @@ public struct HTTP1Channel: HBChannelSetup, HTTPChannelHandler {
         self.responder = responder
     }
 
-    public func initialize(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
+    public func setup(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
         let childChannelHandlers: [any ChannelHandler] =
             [HTTP1ToHTTPServerCodec(secure: false)] +
             self.additionalChannelHandlers() +

Sources/HummingbirdCore/Server/HTTP/HTTPChannelSetupBuilder.swift → Sources/HummingbirdCore/Server/HTTP/HTTPChannelBuilder.swift

@@ -15,17 +15,17 @@
 import NIOCore
 
 /// Build Channel Setup that takes an HTTP responder
-public struct HBHTTPChannelSetupBuilder<ChannelSetup: HBChannelSetup>: Sendable {
-    public let build: @Sendable (@escaping HTTPChannelHandler.Responder) throws -> ChannelSetup
-    public init(_ build: @escaping @Sendable (@escaping HTTPChannelHandler.Responder) throws -> ChannelSetup) {
+public struct HBHTTPChannelBuilder<ChildChannel: HBChildChannel>: Sendable {
+    public let build: @Sendable (@escaping HTTPChannelHandler.Responder) throws -> ChildChannel
+    public init(_ build: @escaping @Sendable (@escaping HTTPChannelHandler.Responder) throws -> ChildChannel) {
         self.build = build
     }
 }
 
-extension HBHTTPChannelSetupBuilder {
+extension HBHTTPChannelBuilder {
     public static func http1(
         additionalChannelHandlers: @autoclosure @escaping @Sendable () -> [any RemovableChannelHandler] = []
-    ) -> HBHTTPChannelSetupBuilder<HTTP1Channel> {
+    ) -> HBHTTPChannelBuilder<HTTP1Channel> {
         return .init { responder in
             return HTTP1Channel(responder: responder, additionalChannelHandlers: additionalChannelHandlers)
         }

Sources/HummingbirdCore/Server/HTTP/HTTPChannelHandler.swift

@@ -20,7 +20,7 @@ import NIOHTTPTypes
 import ServiceLifecycle
 
 /// Protocol for HTTP channels
-public protocol HTTPChannelHandler: HBChannelSetup {
+public protocol HTTPChannelHandler: HBChildChannel {
     typealias Responder = @Sendable (HBRequest, Channel) async throws -> HBResponse
     var responder: Responder { get }
 }

Sources/HummingbirdCore/Server/Server.swift

@@ -23,12 +23,12 @@ import NIOTransportServices
 import ServiceLifecycle
 
 /// HTTP server class
-public actor HBServer<ChannelSetup: HBChannelSetup>: Service {
-    public typealias AsyncChildChannel = ChannelSetup.Value
+public actor HBServer<ChildChannel: HBChildChannel>: Service {
+    public typealias AsyncChildChannel = ChildChannel.Value
     public typealias AsyncServerChannel = NIOAsyncChannel<AsyncChildChannel, Never>
     enum State: CustomStringConvertible {
         case initial(
-            childChannelSetup: ChannelSetup,
+            childChannelSetup: ChildChannel,
             configuration: HBServerConfiguration,
             onServerRunning: (@Sendable (Channel) async -> Void)?
         )
@@ -72,7 +72,7 @@ public actor HBServer<ChannelSetup: HBChannelSetup>: Service {
     ///   - group: EventLoopGroup server uses
     ///   - configuration: Configuration for server
     public init(
-        childChannelSetup: ChannelSetup,
+        childChannelSetup: ChildChannel,
         configuration: HBServerConfiguration,
         onServerRunning: (@Sendable (Channel) async -> Void)? = { _ in },
         eventLoopGroup: EventLoopGroup,
@@ -175,7 +175,7 @@ public actor HBServer<ChannelSetup: HBChannelSetup>: Service {
     /// Start server
     /// - Parameter responder: Object that provides responses to requests sent to the server
     /// - Returns: EventLoopFuture that is fulfilled when server has started
-    public func makeServer(childChannelSetup: ChannelSetup, configuration: HBServerConfiguration) async throws -> AsyncServerChannel {
+    public func makeServer(childChannelSetup: ChildChannel, configuration: HBServerConfiguration) async throws -> AsyncServerChannel {
         let bootstrap: ServerBootstrapProtocol
         #if canImport(Network)
         if let tsBootstrap = self.createTSBootstrap(configuration: configuration) {
@@ -204,7 +204,7 @@ public actor HBServer<ChannelSetup: HBChannelSetup>: Service {
                     port: port,
                     serverBackPressureStrategy: nil
                 ) { channel in
-                    childChannelSetup.initialize(
+                    childChannelSetup.setup(
                         channel: channel,
                         configuration: configuration,
                         logger: self.logger
@@ -217,7 +217,7 @@ public actor HBServer<ChannelSetup: HBChannelSetup>: Service {
                     cleanupExistingSocketFile: false,
                     serverBackPressureStrategy: nil
                 ) { channel in
-                    childChannelSetup.initialize(
+                    childChannelSetup.setup(
                         channel: channel,
                         configuration: configuration,
                         logger: self.logger

Sources/HummingbirdHTTP2/HTTP2Channel.swift

@@ -43,7 +43,7 @@ public struct HTTP2Channel: HTTPChannelHandler {
         self.http1 = HTTP1Channel(responder: responder, additionalChannelHandlers: additionalChannelHandlers)
     }
 
-    public func initialize(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
+    public func setup(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
         do {
             try channel.pipeline.syncOperations.addHandler(NIOSSLServerHandler(context: self.sslContext))
         } catch {

Sources/HummingbirdHTTP2/HTTP2ChannelSetupBuilder.swift → Sources/HummingbirdHTTP2/HTTP2ChannelBuilder.swift

@@ -16,11 +16,11 @@ import HummingbirdCore
 import NIOCore
 import NIOSSL
 
-extension HBHTTPChannelSetupBuilder {
+extension HBHTTPChannelBuilder {
     public static func http2(
         tlsConfiguration: TLSConfiguration,
         additionalChannelHandlers: @autoclosure @escaping @Sendable () -> [any RemovableChannelHandler] = []
-    ) throws -> HBHTTPChannelSetupBuilder<HTTP2Channel> {
+    ) throws -> HBHTTPChannelBuilder<HTTP2Channel> {
         return .init { responder in
             return try HTTP2Channel(
                 tlsConfiguration: tlsConfiguration,

Sources/HummingbirdTLS/TLSChannelSetup.swift → Sources/HummingbirdTLS/TLSChannel.swift

@@ -4,7 +4,7 @@ import NIOCore
 import NIOSSL
 
 /// Sets up child channel to use TLS before accessing base channel setup
-public struct TLSChannel<BaseChannel: HBChannelSetup>: HBChannelSetup {
+public struct TLSChannel<BaseChannel: HBChildChannel>: HBChildChannel {
     public typealias Value = BaseChannel.Value
 
     public init(_ baseChannel: BaseChannel, tlsConfiguration: TLSConfiguration) throws {
@@ -13,9 +13,9 @@ public struct TLSChannel<BaseChannel: HBChannelSetup>: HBChannelSetup {
     }
 
     @inlinable
-    public func initialize(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
+    public func setup(channel: Channel, configuration: HBServerConfiguration, logger: Logger) -> EventLoopFuture<Value> {
         return channel.pipeline.addHandler(NIOSSLServerHandler(context: self.sslContext)).flatMap {
-            self.baseChannel.initialize(channel: channel, configuration: configuration, logger: logger)
+            self.baseChannel.setup(channel: channel, configuration: configuration, logger: logger)
         }
     }
 

Sources/HummingbirdTLS/TLSChannelSetupBuilder.swift → Sources/HummingbirdTLS/TLSChannelBuilder.swift

@@ -15,11 +15,11 @@
 import HummingbirdCore
 import NIOSSL
 
-extension HBHTTPChannelSetupBuilder {
-    public static func tls<BaseChannel: HBChannelSetup>(
-        _ base: HBHTTPChannelSetupBuilder<BaseChannel> = .http1(),
+extension HBHTTPChannelBuilder {
+    public static func tls<BaseChannel: HBChildChannel>(
+        _ base: HBHTTPChannelBuilder<BaseChannel> = .http1(),
         tlsConfiguration: TLSConfiguration
-    ) throws -> HBHTTPChannelSetupBuilder<TLSChannel<BaseChannel>> {
+    ) throws -> HBHTTPChannelBuilder<TLSChannel<BaseChannel>> {
         return .init { responder in
             return try TLSChannel(base.build(responder), tlsConfiguration: tlsConfiguration)
         }

Sources/HummingbirdXCT/HBXCTLive.swift

@@ -28,15 +28,15 @@ final class HBXCTLive<App: HBApplicationProtocol>: HBXCTApplication {
     /// TestApplication used to wrap HBApplication being tested
     struct TestApplication<BaseApp: HBApplicationProtocol>: HBApplicationProtocol, Service {
         typealias Responder = BaseApp.Responder
-        typealias ChannelSetup = BaseApp.ChannelSetup
+        typealias ChildChannel = BaseApp.ChildChannel
 
         let base: BaseApp
 
         var responder: Responder {
             get async throws { try await self.base.responder }
         }
 
-        var channelSetup: HBHTTPChannelSetupBuilder<ChannelSetup> {
+        var channelSetup: HBHTTPChannelBuilder<ChildChannel> {
             self.base.channelSetup
         }
 

Tests/HummingbirdCoreTests/TestUtils.swift

@@ -31,13 +31,13 @@ public enum TestErrors: Error {
 }
 
 /// Helper function for testing a server
-public func testServer<ChannelSetup: HBChannelSetup, Value: Sendable>(
+public func testServer<ChildChannel: HBChildChannel, Value: Sendable>(
     responder: @escaping HTTPChannelHandler.Responder,
-    httpChannelSetup: HBHTTPChannelSetupBuilder<ChannelSetup>,
+    httpChannelSetup: HBHTTPChannelBuilder<ChildChannel>,
     configuration: HBServerConfiguration,
     eventLoopGroup: EventLoopGroup,
     logger: Logger,
-    _ test: @escaping @Sendable (HBServer<ChannelSetup>, Int) async throws -> Value
+    _ test: @escaping @Sendable (HBServer<ChildChannel>, Int) async throws -> Value
 ) async throws -> Value {
     try await withThrowingTaskGroup(of: Void.self) { group in
         let promise = Promise<Int>()
@@ -68,14 +68,14 @@ public func testServer<ChannelSetup: HBChannelSetup, Value: Sendable>(
 ///
 /// Creates test client, runs test function abd ensures everything is
 /// shutdown correctly
-public func testServer<ChannelSetup: HBChannelSetup, Value: Sendable>(
+public func testServer<ChildChannel: HBChildChannel, Value: Sendable>(
     responder: @escaping HTTPChannelHandler.Responder,
-    httpChannelSetup: HBHTTPChannelSetupBuilder<ChannelSetup>,
+    httpChannelSetup: HBHTTPChannelBuilder<ChildChannel>,
     configuration: HBServerConfiguration,
     eventLoopGroup: EventLoopGroup,
     logger: Logger,
     clientConfiguration: HBXCTClient.Configuration = .init(),
-    _ test: @escaping @Sendable (HBServer<ChannelSetup>, HBXCTClient) async throws -> Value
+    _ test: @escaping @Sendable (HBServer<ChildChannel>, HBXCTClient) async throws -> Value
 ) async throws -> Value {
     try await withThrowingTaskGroup(of: Void.self) { group in
         let promise = Promise<Int>()
@@ -112,7 +112,7 @@ public func testServer<ChannelSetup: HBChannelSetup, Value: Sendable>(
 
 public func testServer<Value: Sendable>(
     responder: @escaping HTTPChannelHandler.Responder,
-    httpChannelSetup: HBHTTPChannelSetupBuilder<some HBChannelSetup> = .http1(),
+    httpChannelSetup: HBHTTPChannelBuilder<some HBChildChannel> = .http1(),
     configuration: HBServerConfiguration,
     eventLoopGroup: EventLoopGroup,
     logger: Logger,