Make HTTPChannelHandler.responder immutable

hummingbird-project · Dec 16, 2023 · 39d9075 · 39d9075
1 parent 4366644
commit 39d9075
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/Sources/HummingbirdCore/Server/HTTP/HTTP1Channel.swift b/Sources/HummingbirdCore/Server/HTTP/HTTP1Channel.swift
@@ -22,7 +22,7 @@ public struct HTTP1Channel: HBChannelSetup, HTTPChannelHandler {
     public typealias Value = NIOAsyncChannel<HTTPRequestPart, HTTPResponsePart>
 
     public init(
-        responder: @escaping @Sendable (HBRequest, Channel) async throws -> HBResponse = { _, _ in throw HBHTTPError(.notImplemented) },
+        responder: @escaping @Sendable (HBRequest, Channel) async throws -> HBResponse,
         additionalChannelHandlers: @escaping @Sendable () -> [any RemovableChannelHandler] = { [] }
     ) {
         self.additionalChannelHandlers = additionalChannelHandlers
@@ -51,6 +51,6 @@ public struct HTTP1Channel: HBChannelSetup, HTTPChannelHandler {
         await handleHTTP(asyncChannel: asyncChannel, logger: logger)
     }
 
-    public var responder: @Sendable (HBRequest, Channel) async throws -> HBResponse
+    public let responder: @Sendable (HBRequest, Channel) async throws -> HBResponse
     let additionalChannelHandlers: @Sendable () -> [any RemovableChannelHandler]
 }
diff --git a/Sources/HummingbirdCore/Server/HTTP/HTTPChannelHandler.swift b/Sources/HummingbirdCore/Server/HTTP/HTTPChannelHandler.swift
@@ -22,7 +22,7 @@ import ServiceLifecycle
 /// Protocol for HTTP channels
 public protocol HTTPChannelHandler: HBChannelSetup {
     typealias Responder = @Sendable (HBRequest, Channel) async throws -> HBResponse
-    var responder: Responder { get set }
+    var responder: Responder { get }
 }
 
 /// Internal error thrown when an unexpected HTTP part is received eg we didn't receive

diff --git a/Sources/HummingbirdHTTP2/HTTP2Channel.swift b/Sources/HummingbirdHTTP2/HTTP2Channel.swift
@@ -27,12 +27,9 @@ public struct HTTP2Channel: HTTPChannelHandler {
     public typealias Value = EventLoopFuture<NIONegotiatedHTTPVersion<HTTP1Channel.Value, (NIOAsyncChannel<HTTP2Frame, HTTP2Frame>, NIOHTTP2Handler.AsyncStreamMultiplexer<HTTP1Channel.Value>)>>
 
     private let sslContext: NIOSSLContext
-    private var http1: HTTP1Channel
+    private let http1: HTTP1Channel
     private let additionalChannelHandlers: @Sendable () -> [any RemovableChannelHandler]
-    public var responder: @Sendable (HBRequest, Channel) async throws -> HBResponse {
-        get { http1.responder }
-        set { http1.responder = newValue }
-    }
+    public var responder: @Sendable (HBRequest, Channel) async throws -> HBResponse { http1.responder }
 
     public init(
         tlsConfiguration: TLSConfiguration,

diff --git a/Sources/HummingbirdTLS/TLSChannelSetup.swift b/Sources/HummingbirdTLS/TLSChannelSetup.swift
@@ -32,7 +32,6 @@ public struct TLSChannel<BaseChannel: HBChannelSetup>: HBChannelSetup {
 
 extension TLSChannel: HTTPChannelHandler where BaseChannel: HTTPChannelHandler {
     public var responder: @Sendable (HBRequest, Channel) async throws -> HBResponse {
-        get { baseChannel.responder }
-        set { baseChannel.responder = newValue }
+        baseChannel.responder
     }
 }