CompositeHTTPHandler -> RouteHTTPHandler

Author: swhitty

Sources/HTTPServer.swift

@@ -37,7 +37,7 @@ public final actor HTTPServer {
     private let timeout: TimeInterval
     private var socket: AsyncSocket?
     private let logger: HTTPLogging?
-    private var handlers: CompositeHTTPHandler
+    private var handlers: RouteHTTPHandler
 
     public init(port: UInt16,
                 timeout: TimeInterval = 15,
@@ -59,12 +59,12 @@ public final actor HTTPServer {
                   handler: ClosureHTTPHandler(handler))
     }
 
-    public func appendHandler(for route: HTTPRoute, handler: HTTPHandler) {
-        handlers.appendHandler(for: route, handler: handler)
+    public func appendRoute(_ route: HTTPRoute, to handler: HTTPHandler) {
+        handlers.appendRoute(route, to: handler)
     }
 
-    public func appendHandler(for route: HTTPRoute, closure: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
-        handlers.appendHandler(for: route, closure: closure)
+    public func appendRoute(_ route: HTTPRoute, handler: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
+        handlers.appendRoute(route, handler: handler)
     }
 
     public func start() async throws {
@@ -150,10 +150,10 @@ public final actor HTTPServer {
         }
     }
 
-    private static func makeCompositeHandler(root: HTTPHandler?) -> CompositeHTTPHandler {
-        var composite = CompositeHTTPHandler()
+    private static func makeCompositeHandler(root: HTTPHandler?) -> RouteHTTPHandler {
+        var composite = RouteHTTPHandler()
         if let handler = root {
-            composite.appendHandler(for: "*", handler: handler)
+            composite.appendRoute("*", to: handler)
         }
         return composite
     }
@@ -183,3 +183,18 @@ private extension HTTPConnection {
         "<\(hostname)>"
     }
 }
+
+
+public extension HTTPServer {
+
+    @available(*, deprecated, renamed: "appendRoute(_:to:)")
+    func appendHandler(for route: HTTPRoute, handler: HTTPHandler) {
+        appendRoute(route, to: handler)
+
+    }
+
+    @available(*, deprecated, renamed: "appendRoute(_:to:)")
+    func appendHandler(for route: HTTPRoute, closure: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
+        appendRoute(route, handler: closure)
+    }
+}

Sources/Handlers/CompositeHTTPHandler.swift renamed to Sources/Handlers/RouteHTTPHandler.swift

@@ -29,19 +29,19 @@
 //  SOFTWARE.
 //
 
-public struct CompositeHTTPHandler: HTTPHandler, Sendable {
+public struct RouteHTTPHandler: HTTPHandler, Sendable {
 
     private var handlers: [(route: HTTPRoute, handler: HTTPHandler)] = []
 
     public init() { }
 
-    public mutating func appendHandler(for route: HTTPRoute, handler: HTTPHandler) {
+    public mutating func appendRoute(_ route: HTTPRoute, to handler: HTTPHandler) {
         handlers.append((route, handler))
     }
 
-    public mutating func appendHandler(for route: HTTPRoute,
-                                       closure: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
-        handlers.append((route, ClosureHTTPHandler(closure)))
+    public mutating func appendRoute(_ route: HTTPRoute,
+                                     handler: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
+        handlers.append((route, ClosureHTTPHandler(handler)))
     }
 
     public func handleRequest(_ request: HTTPRequest) async throws -> HTTPResponse {
@@ -57,3 +57,25 @@ public struct CompositeHTTPHandler: HTTPHandler, Sendable {
         throw HTTPUnhandledError()
     }
 }
+
+@available(*, deprecated, renamed: "RouteHTTPHandler")
+public typealias CompositeHTTPHandler = RouteHTTPHandler
+
+
+public extension RouteHTTPHandler {
+
+    @available(*, deprecated, renamed: "RouteHTTPHandler")
+
+
+    @available(*, deprecated, renamed: "appendRoute(_:to:)")
+    mutating func appendHandler(for route: HTTPRoute, handler: HTTPHandler) {
+        appendRoute(route, to: handler)
+
+    }
+
+    @available(*, deprecated, renamed: "appendRoute(_:to:)")
+    mutating func appendHandler(for route: HTTPRoute,
+                                closure: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
+        appendRoute(route, handler: closure)
+    }
+}

Tests/HTTPServerTests.swift

@@ -41,10 +41,10 @@ final class HTTPServerTests: XCTestCase {
     func testRequests_AreMatchedToHandlers_ViaRoute() async throws {
         let server = HTTPServer(port: 8008)
 
-        await server.appendHandler(for: "/accepted") { _ in
+        await server.appendRoute("/accepted") { _ in
             HTTPResponse.make(statusCode: .accepted)
         }
-        await server.appendHandler(for: "/gone") { _ in
+        await server.appendRoute("/gone") { _ in
             HTTPResponse.make(statusCode: .gone)
         }
 
@@ -116,7 +116,7 @@ final class HTTPServerTests: XCTestCase {
 
     func testServer_ReturnsFile_WhenFileHandlerIsMatched() async throws {
         let server = HTTPServer(port: 8009)
-        await server.appendHandler(for: "*", handler: .file(named: "fish.json", in: .module))
+        await server.appendRoute("*", to: .file(named: "fish.json", in: .module))
         let task = Task { try await server.start() }
 
         let request = URLRequest(url: URL(string: "http://localhost:8009")!)
@@ -132,7 +132,7 @@ final class HTTPServerTests: XCTestCase {
 #if canImport(Darwin)
     func testServer_Returns500_WhenHandlerTimesout() async throws {
         let server = HTTPServer(port: 8008, timeout: 0.1)
-        await server.appendHandler(for: "*") { _ in
+        await server.appendRoute("*") { _ in
             try await Task.sleep(nanoseconds: 5_000_000_000)
             return .make(statusCode: .ok)
         }