Merge branch 'main' into sebsto/fix_507

Author: sebsto

.github/workflows/pull_request.yml

@@ -17,21 +17,13 @@ jobs:
       format_check_container_image: "swiftlang/swift:nightly-6.1-jammy"
       yamllint_check_enabled: true
 
-  # https://github.com/apple/swift-nio/blob/main/.github/workflows/unit_tests.yml
   unit-tests:
     name: Unit tests
     uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
     with:
       linux_5_9_enabled: false
       linux_5_10_enabled: false
-      linux_6_0_enabled: true
-      # this currently resolves to 6.1 nightly
-      linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
-      linux_nightly_next_enabled: true
-      linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
-      # this currently resolves to 6.2.dev
-      # It crashes some of our tests https://github.com/swift-server/swift-aws-lambda-runtime/issues/509
-      linux_nightly_main_enabled: true
+      linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   integration-tests:

Examples/CDK/infra/package-lock.json

@@ -17,7 +17,7 @@
     "typescript": "~5.8.2"
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.183.0",
+    "aws-cdk-lib": "^2.189.1",
     "constructs": "^10.4.2"
   }
 }

Examples/CDK/infra/package.json

@@ -28,12 +28,19 @@ enum ControlPlaneResponse: Hashable {
     case error(ErrorResponse)
 }
 
-package struct InvocationMetadata: Hashable {
+@usableFromInline
+package struct InvocationMetadata: Hashable, Sendable {
+    @usableFromInline
     package let requestID: String
+    @usableFromInline
     package let deadlineInMillisSinceEpoch: Int64
+    @usableFromInline
     package let invokedFunctionARN: String
+    @usableFromInline
     package let traceID: String
+    @usableFromInline
     package let clientContext: String?
+    @usableFromInline
     package let cognitoIdentity: String?
 
     package init(headers: HTTPHeaders) throws(LambdaRuntimeError) {

Sources/AWSLambdaRuntime/ControlPlaneRequest.swift

@@ -45,6 +45,7 @@ extension Lambda {
     ///     - body: Code to run within the context of the mock server. Typically this would be a Lambda.run function call.
     ///
     /// - note: This API is designed strictly for local testing and is behind a DEBUG flag
+    @usableFromInline
     static func withLocalServer(
         invocationEndpoint: String? = nil,
         _ body: sending @escaping () async throws -> Void
@@ -237,7 +238,7 @@ private struct LambdaHTTPServer {
                         requestHead = head
 
                     case .body(let body):
-                        requestBody = body
+                        requestBody.setOrWriteImmutableBuffer(body)
 
                     case .end:
                         precondition(requestHead != nil, "Received .end without .head")

Sources/AWSLambdaRuntime/Lambda+LocalServer.swift

@@ -30,6 +30,7 @@ import ucrt
 #endif
 
 public enum Lambda {
+    @inlinable
     package static func runLoop<RuntimeClient: LambdaRuntimeClientProtocol, Handler>(
         runtimeClient: RuntimeClient,
         handler: Handler,

Sources/AWSLambdaRuntime/Lambda.swift

@@ -88,7 +88,7 @@ public struct LambdaContext: CustomDebugStringConvertible, Sendable {
         self.storage.logger
     }
 
-    init(
+    public init(
         requestID: String,
         traceID: String,
         invokedFunctionARN: String,

Sources/AWSLambdaRuntime/LambdaContext.swift

@@ -32,8 +32,11 @@ private let _isRunning = Atomic<Bool>(false)
 // sadly crashes the compiler today (on Linux).
 public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: StreamingLambdaHandler {
     // TODO: We want to change this to Mutex as soon as this doesn't crash the Swift compiler on Linux anymore
+    @usableFromInline
     let handlerMutex: NIOLockedValueBox<Handler?>
+    @usableFromInline
     let logger: Logger
+    @usableFromInline
     let eventLoop: EventLoop
 
     public init(
@@ -54,6 +57,7 @@ public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: St
     }
 
     /// Make sure only one run() is called at a time
+    @inlinable
     public func run() async throws {
 
         // we use an atomic global variable to ensure only one LambdaRuntime is running at the time

Sources/AWSLambdaRuntime/LambdaRuntime.swift

@@ -17,33 +17,47 @@ import NIOCore
 import NIOHTTP1
 import NIOPosix
 
+@usableFromInline
 final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
+    @usableFromInline
     nonisolated let unownedExecutor: UnownedSerialExecutor
 
-    struct Configuration {
+    @usableFromInline
+    struct Configuration: Sendable {
         var ip: String
         var port: Int
+
+        @usableFromInline
+        init(ip: String, port: Int) {
+            self.ip = ip
+            self.port = port
+        }
     }
 
-    struct Writer: LambdaRuntimeClientResponseStreamWriter {
+    @usableFromInline
+    struct Writer: LambdaRuntimeClientResponseStreamWriter, Sendable {
         private var runtimeClient: LambdaRuntimeClient
 
         fileprivate init(runtimeClient: LambdaRuntimeClient) {
             self.runtimeClient = runtimeClient
         }
 
+        @usableFromInline
         func write(_ buffer: NIOCore.ByteBuffer) async throws {
             try await self.runtimeClient.write(buffer)
         }
 
+        @usableFromInline
         func finish() async throws {
             try await self.runtimeClient.writeAndFinish(nil)
         }
 
+        @usableFromInline
         func writeAndFinish(_ buffer: NIOCore.ByteBuffer) async throws {
             try await self.runtimeClient.writeAndFinish(buffer)
         }
 
+        @usableFromInline
         func reportError(_ error: any Error) async throws {
             try await self.runtimeClient.reportError(error)
         }
@@ -90,6 +104,7 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
     // being fully closed before we can return from it.
     private var closingConnections: [any Channel] = []
 
+    @inlinable
     static func withRuntimeClient<Result>(
         configuration: Configuration,
         eventLoop: any EventLoop,
@@ -110,14 +125,16 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
         return try result.get()
     }
 
-    private init(configuration: Configuration, eventLoop: any EventLoop, logger: Logger) {
+    @usableFromInline
+    init(configuration: Configuration, eventLoop: any EventLoop, logger: Logger) {
         self.unownedExecutor = eventLoop.executor.asUnownedSerialExecutor()
         self.configuration = configuration
         self.eventLoop = eventLoop
         self.logger = logger
     }
 
-    private func close() async {
+    @usableFromInline
+    func close() async {
         self.logger.trace("Close lambda runtime client")
 
         guard case .notClosing = self.closingState else {
@@ -144,6 +161,7 @@ final actor LambdaRuntimeClient: LambdaRuntimeClientProtocol {
         }
     }
 
+    @usableFromInline
     func nextInvocation() async throws -> (Invocation, Writer) {
         try await withTaskCancellationHandler {
             switch self.lambdaState {

Sources/AWSLambdaRuntime/LambdaRuntimeClient.swift

@@ -14,21 +14,26 @@
 
 import NIOCore
 
+@usableFromInline
 package protocol LambdaRuntimeClientResponseStreamWriter: LambdaResponseStreamWriter {
     func write(_ buffer: ByteBuffer) async throws
     func finish() async throws
     func writeAndFinish(_ buffer: ByteBuffer) async throws
     func reportError(_ error: any Error) async throws
 }
 
+@usableFromInline
 package protocol LambdaRuntimeClientProtocol {
     associatedtype Writer: LambdaRuntimeClientResponseStreamWriter
 
     func nextInvocation() async throws -> (Invocation, Writer)
 }
 
-package struct Invocation {
+@usableFromInline
+package struct Invocation: Sendable {
+    @usableFromInline
     package var metadata: InvocationMetadata
+    @usableFromInline
     package var event: ByteBuffer
 
     package init(metadata: InvocationMetadata, event: ByteBuffer) {

Sources/AWSLambdaRuntime/LambdaRuntimeClientProtocol.swift

@@ -12,10 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+@usableFromInline
 public struct LambdaRuntimeError: Error {
+    @usableFromInline
+    /// internal error codes for LambdaRuntimeClient
     package enum Code: Sendable {
-
-        /// internal error codes for LambdaRuntimeClient
         case closingRuntimeClient
 
         case connectionToControlPlaneLost
@@ -39,12 +40,15 @@ public struct LambdaRuntimeError: Error {
         case moreThanOneLambdaRuntimeInstance
     }
 
+    @usableFromInline
     package init(code: Code, underlying: (any Error)? = nil) {
         self.code = code
         self.underlying = underlying
     }
 
-    var code: Code
-    public var underlying: (any Error)?
+    @usableFromInline
+    package var code: Code
+    @usableFromInline
+    package var underlying: (any Error)?
 
 }

Sources/AWSLambdaRuntime/LambdaRuntimeError.swift

@@ -59,6 +59,7 @@ enum Signal: Int32 {
 }
 
 extension DispatchWallTime {
+    @usableFromInline
     init(millisSinceEpoch: Int64) {
         let nanoSinceEpoch = UInt64(millisSinceEpoch) * 1_000_000
         let seconds = UInt64(nanoSinceEpoch / 1_000_000_000)