Merge branch 'main' into sebsto/pool

Author: sebsto

Package.swift

@@ -17,7 +17,7 @@ let package = Package(
         .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.77.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
     ],
     targets: [
@@ -36,8 +36,7 @@ let package = Package(
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
                 .product(name: "NIOPosix", package: "swift-nio"),
-            ],
-            swiftSettings: [.swiftLanguageMode(.v5)]
+            ]
         ),
         .plugin(
             name: "AWSLambdaPackager",

Plugins/AWSLambdaPackager/Plugin.swift

@@ -307,7 +307,7 @@ struct AWSLambdaPackager: CommandPlugin {
 
             USAGE: swift package --allow-network-connections docker archive
                                                        [--help] [--verbose]
-                                                       [--output-directory <path>]
+                                                       [--output-path <path>]
                                                        [--products <list of products>]
                                                        [--configuration debug | release]
                                                        [--swift-version <version>]
@@ -317,7 +317,7 @@ struct AWSLambdaPackager: CommandPlugin {
 
             OPTIONS:
             --verbose                     Produce verbose output for debugging.
-            --output-directory <path>     The path of the binary package.
+            --output-path <path>          The path of the binary package.
                                           (default is `.build/plugins/AWSLambdaPackager/outputs/...`)
             --products <list>             The list of executable targets to build.
                                           (default is taken from Package.swift)

Sources/AWSLambdaRuntime/Lambda+Codable.swift

@@ -66,7 +66,7 @@ extension LambdaCodableAdapter {
     public init(
         encoder: JSONEncoder = JSONEncoder(),
         decoder: JSONDecoder = JSONDecoder(),
-        handler: Handler
+        handler: sending Handler
     )
     where
         Output: Encodable,

Sources/AWSLambdaRuntimeCore/Lambda+Codable.swift

@@ -58,7 +58,7 @@ public struct LambdaHandlerAdapter<
     /// Initializes an instance given a concrete handler.
     /// - Parameter handler: The ``LambdaHandler`` conforming handler that is to be adapted to ``LambdaWithBackgroundProcessingHandler``.
     @inlinable
-    public init(handler: Handler) {
+    public init(handler: sending Handler) {
         self.handler = handler
     }
 
@@ -98,7 +98,7 @@ public struct LambdaCodableAdapter<
     ///   - decoder: The decoder object that will be used to decode the received `ByteBuffer` event into the generic `Event` type served to the `handler`.
     ///   - handler: The handler object.
     @inlinable
-    public init(encoder: Encoder, decoder: Decoder, handler: Handler) where Output: Encodable {
+    public init(encoder: sending Encoder, decoder: sending Decoder, handler: sending Handler) where Output: Encodable {
         self.encoder = encoder
         self.decoder = decoder
         self.handler = handler
@@ -109,7 +109,7 @@ public struct LambdaCodableAdapter<
     ///     - decoder: The decoder object that will be used to decode the received `ByteBuffer` event into the generic `Event` type served to the `handler`.
     ///     - handler: The handler object.
     @inlinable
-    public init(decoder: Decoder, handler: Handler) where Output == Void, Encoder == VoidEncoder {
+    public init(decoder: sending Decoder, handler: Handler) where Output == Void, Encoder == VoidEncoder {
         self.encoder = VoidEncoder()
         self.decoder = decoder
         self.handler = handler

Sources/AWSLambdaRuntimeCore/Lambda+LocalServer.swift

@@ -174,13 +174,14 @@ private struct LambdaHttpServer {
         do {
             try await channel.executeThenClose { inbound, outbound in
                 for try await inboundData in inbound {
-                    if case .head(let head) = inboundData {
+                    switch inboundData {
+                    case .head(let head):
                         requestHead = head
-                    }
-                    if case .body(let body) = inboundData {
+
+                    case .body(let body):
                         requestBody = body
-                    }
-                    if case .end = inboundData {
+
+                    case .end:
                         precondition(requestHead != nil, "Received .end without .head")
                         // process the request
                         let response = try await self.processRequest(

Sources/AWSLambdaRuntimeCore/LambdaHandlers.swift

@@ -154,7 +154,7 @@ public struct ClosureHandler<Event: Decodable, Output>: LambdaHandler {
 
     /// Initialize with a closure handler over generic `Input` and `Output` types.
     /// - Parameter body: The handler function written as a closure.
-    public init(body: @escaping (Event, LambdaContext) async throws -> Output) where Output: Encodable {
+    public init(body: sending @escaping (Event, LambdaContext) async throws -> Output) where Output: Encodable {
         self.body = body
     }
 
@@ -192,8 +192,8 @@ extension LambdaRuntime {
         Encoder: LambdaOutputEncoder,
         Decoder: LambdaEventDecoder
     >(
-        encoder: Encoder,
-        decoder: Decoder,
+        encoder: sending Encoder,
+        decoder: sending Decoder,
         body: sending @escaping (Event, LambdaContext) async throws -> Output
     )
     where
@@ -205,21 +205,23 @@ extension LambdaRuntime {
             Encoder
         >
     {
-        let handler = LambdaCodableAdapter(
+        let closureHandler = ClosureHandler(body: body)
+        let streamingAdapter = LambdaHandlerAdapter(handler: closureHandler)
+        let codableWrapper = LambdaCodableAdapter(
             encoder: encoder,
             decoder: decoder,
-            handler: LambdaHandlerAdapter(handler: ClosureHandler(body: body))
+            handler: streamingAdapter
         )
 
-        self.init(handler: handler)
+        self.init(handler: codableWrapper)
     }
 
     /// Initialize an instance with a ``LambdaHandler`` defined in the form of a closure **with a `Void` return type**, an encoder, and a decoder.
     /// - Parameters:
     ///   - decoder: The decoder object that will be used to decode the incoming `ByteBuffer` event into the generic `Event` type.
     ///   - body: The handler in the form of a closure.
     public convenience init<Event: Decodable, Decoder: LambdaEventDecoder>(
-        decoder: Decoder,
+        decoder: sending Decoder,
         body: sending @escaping (Event, LambdaContext) async throws -> Void
     )
     where

Sources/AWSLambdaRuntimeCore/LambdaRuntimeClient.swift

@@ -49,9 +49,13 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
         }
     }
 
+    private typealias ConnectionContinuation = CheckedContinuation<
+        NIOLoopBound<LambdaChannelHandler<LambdaRuntimeClient>>, any Error
+    >
+
     private enum ConnectionState {
         case disconnected
-        case connecting([CheckedContinuation<LambdaChannelHandler<LambdaRuntimeClient>, any Error>])
+        case connecting([ConnectionContinuation])
         case connected(Channel, LambdaChannelHandler<LambdaRuntimeClient>)
     }
 
@@ -158,7 +162,6 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
             .sentResponse:
             fatalError("Invalid state: \(self.lambdaState)")
         }
-
     }
 
     private func write(_ buffer: NIOCore.ByteBuffer) async throws {
@@ -284,11 +287,11 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
         case .connecting(var array):
             // Since we do get sequential invocations this case normally should never be hit.
             // We'll support it anyway.
-            return try await withCheckedThrowingContinuation {
-                (continuation: CheckedContinuation<LambdaChannelHandler<LambdaRuntimeClient>, any Error>) in
+            let loopBound = try await withCheckedThrowingContinuation { (continuation: ConnectionContinuation) in
                 array.append(continuation)
                 self.connectionState = .connecting(array)
             }
+            return loopBound.value
         case .connected(_, let handler):
             return handler
         }
@@ -339,8 +342,9 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
             case .connecting(let array):
                 self.connectionState = .connected(channel, handler)
                 defer {
+                    let loopBound = NIOLoopBound(handler, eventLoop: self.eventLoop)
                     for continuation in array {
-                        continuation.resume(returning: handler)
+                        continuation.resume(returning: loopBound)
                     }
                 }
                 return handler

readme.md

@@ -1,7 +1,7 @@
 > [!IMPORTANT]
 > The documentation included here refers to the Swift AWS Lambda Runtime v2 (code from the main branch). If you're developing for the runtime v1.x, check this [readme](https://github.com/swift-server/swift-aws-lambda-runtime/blob/v1/readme.md) instead.
 
-This guide contains the follwoing sections:
+This guide contains the following sections:
 
 - [The Swift AWS Lambda Runtime](#the-swift-aws-lambda-runtime)
 - [Pre-requisites](#pre-requisites)