Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Sources/HTTPServer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public final actor HTTPServer {
handlers.appendRoute(route, handler: handler)
}

public func appendRoutes(_ newHandlers: [(HTTPRoute, HTTPHandler)]) {
handlers.appendRoutes(newHandlers)
}

public func start() async throws {
let socket = try Socket(domain: AF_INET6, type: Socket.stream)
try socket.setValue(true, for: .localAddressReuse)
Expand Down Expand Up @@ -198,3 +202,17 @@ public extension HTTPServer {
appendRoute(route, handler: closure)
}
}

// MARK: Custom Operator

precedencegroup RouteHandlerPrecedence {

lowerThan: BitwiseShiftPrecedence, MultiplicationPrecedence, AdditionPrecedence, RangeFormationPrecedence, CastingPrecedence, NilCoalescingPrecedence, ComparisonPrecedence, LogicalConjunctionPrecedence, LogicalDisjunctionPrecedence, TernaryPrecedence
higherThan: AssignmentPrecedence
}

infix operator => : RouteHandlerPrecedence

public func => (route: HTTPRoute, handler: HTTPHandler) -> (HTTPRoute, HTTPHandler) {
(route, handler)
}
4 changes: 4 additions & 0 deletions Sources/Handlers/RoutedHTTPHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public struct RoutedHTTPHandler: HTTPHandler, Sendable {
handlers.append((route, handler))
}

public mutating func appendRoutes(_ newHandlers: [(HTTPRoute, HTTPHandler)]) {
handlers.append(contentsOf: newHandlers)
}

public mutating func appendRoute(_ route: HTTPRoute,
handler: @Sendable @escaping (HTTPRequest) async throws -> HTTPResponse) {
handlers.append((route, ClosureHTTPHandler(handler)))
Expand Down
28 changes: 28 additions & 0 deletions Tests/HTTPServerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,34 @@ final class HTTPServerTests: XCTestCase {
)
}

func testRequests_AreMatchedToHandlers_ViaMultipleRouters() async throws {
let server = HTTPServer(port: 8010)

await server.appendRoutes([
"/fish/accepted" => ClosureHTTPHandler { _ in
HTTPResponse.make(statusCode: .accepted)
},
"/fish/*" => .file(named: "fish.json", in: .module)
])

let task = Task { try await server.start() }
defer { task.cancel() }

let response = await server.handleRequest(.make(method: .GET, path: "/fish/accepted"))
XCTAssertEqual(
response.statusCode,
.accepted
)

let request = URLRequest(url: URL(string: "http://localhost:8010/fish/chips")!)
let (data, _) = try await URLSession.shared.makeData(for: request)

XCTAssertEqual(
data,
#"{"fish": "cakes"}"#.data(using: .utf8)
)
}

func testUnmatchedRequests_Return404() async throws {
let server = HTTPServer(port: 8008)

Expand Down