Merge pull request #39 from sidepelican/async_servicebuilder

Allow async and throwing for service builder

Author: sidepelican

Sources/CallableKitHummingbirdTransport/HummingbirdTransport.swift

@@ -3,21 +3,21 @@ import Foundation
 import Hummingbird
 
 public struct HummingbirdTransport<Router: RouterMethods, Service>: ServiceTransport {
-    public init(router: Router, serviceBuilder: @escaping @Sendable (Request, Router.Context) -> Service) {
+    public init(router: Router, serviceBuilder: @escaping @Sendable (Request, Router.Context) async throws -> Service) {
         self.router = router
         self.serviceBuilder = serviceBuilder
     }
 
     public var router: Router
-    public var serviceBuilder: @Sendable (Request, Router.Context) -> Service
+    public var serviceBuilder: @Sendable (Request, Router.Context) async throws -> Service
 
     public func register<Request: Decodable, Response: Encodable>(
         path: String,
         methodSelector: @escaping @Sendable (Service.Type) -> (Service) -> (Request) async throws -> Response
     ) {
         router.post(RouterPath(path)) { [serviceBuilder] request, context in
             let serviceRequest = try await makeDecoder().decode(Request.self, from: request, context: context)
-            let service = serviceBuilder(request, context)
+            let service = try await serviceBuilder(request, context)
             let serviceResponse = try await methodSelector(Service.self)(service)(serviceRequest)
             var response = try makeEncoder().encode(serviceResponse, from: request, context: context)
             response.headers[.cacheControl] = "no-store"

Sources/CallableKitVaporTransport/VaporTransport.swift

@@ -2,13 +2,13 @@ import CallableKit
 import Vapor
 
 public struct VaporTransport<Service>: ServiceTransport {
-    public init(router: any RoutesBuilder, serviceBuilder: @escaping @Sendable (Request) -> Service) {
+    public init(router: any RoutesBuilder, serviceBuilder: @escaping @Sendable (Request) async throws -> Service) {
         self.router = router
         self.serviceBuilder = serviceBuilder
     }
 
     public var router: any RoutesBuilder
-    public var serviceBuilder: @Sendable (Request) -> Service
+    public var serviceBuilder: @Sendable (Request) async throws -> Service
 
     public func register<Request: Decodable, Response: Encodable>(
         path: String,
@@ -19,7 +19,7 @@ public struct VaporTransport<Service>: ServiceTransport {
                 throw Abort(.badRequest, reason: "no body")
             }
             let serviceRequest = try makeDecoder().decode(Request.self, from: body)
-            let service = serviceBuilder(request)
+            let service = try await serviceBuilder(request)
             let serviceResponse = try await methodSelector(Service.self)(service)(serviceRequest)
 
             var headers = HTTPHeaders()

example/Sources/HBServer/HBMain.swift

@@ -29,7 +29,7 @@ struct ErrorMiddleware<Context: RequestContext>: MiddlewareProtocol {
         router.add(middleware: ErrorMiddleware())
 
         configureAccountServiceProtocol(transport: HummingbirdTransport(router: router) { _, _ in
-            makeAccountService()
+            try await makeAccountService()
         })
         configureEchoServiceProtocol(transport: HummingbirdTransport(router: router) { _, _ in
             makeEchoService()

example/Sources/Service/AccountService.swift

@@ -1,7 +1,7 @@
 import APIDefinition
 import OtherDependency
 
-public func makeAccountService() -> some AccountServiceProtocol {
+public func makeAccountService() async throws -> some AccountServiceProtocol {
     AccountService()
 }
 

example/Sources/VaporServer/VaporMain.swift

@@ -25,7 +25,7 @@ import Service
 
         app.group(myErrorMiddleware) { routes in
             configureAccountServiceProtocol(transport: VaporTransport(router: routes) { _ in
-                makeAccountService()
+                try await makeAccountService()
             })
             configureEchoServiceProtocol(transport: VaporTransport(router: routes) { _ in
                 makeEchoService()