API Refactoring

Examples/Benchmark/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/Deployment/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/Deployment/Sources/Benchmark/BenchmarkHandler.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import AWSLambdaRuntimeCore
-import NIO
+import NIOCore
 
 // If you would like to benchmark Swift's Lambda Runtime,
 // use this example which is more performant.

Examples/Deployment/Sources/HelloWorld/HelloWorldHandler.swift

@@ -17,13 +17,6 @@ import AWSLambdaRuntime
 // introductory example, the obligatory "hello, world!"
 @main
 struct HelloWorldHandler: LambdaHandler {
-    typealias Event = String
-    typealias Output = String
-
-    init(context: LambdaInitializationContext) async throws {
-        // setup your resources that you want to reuse here.
-    }
-
     func handle(_ event: String, context: LambdaContext) async throws -> String {
         "hello, world"
     }

Examples/Echo/Lambda.swift

@@ -18,13 +18,6 @@ import AWSLambdaRuntime
 
 @main
 struct MyLambda: LambdaHandler {
-    typealias Event = String
-    typealias Output = String
-
-    init(context: LambdaInitializationContext) async throws {
-        // setup your resources that you want to reuse for every invocation here.
-    }
-
     func handle(_ input: String, context: LambdaContext) async throws -> String {
         // as an example, respond with the input's reversed
         String(input.reversed())

Examples/Echo/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/ErrorHandling/Lambda.swift

@@ -21,8 +21,6 @@ struct MyLambda: LambdaHandler {
     typealias Event = Request
     typealias Output = Response
 
-    init(context: LambdaInitializationContext) async throws {}
-
     func handle(_ request: Request, context: LambdaContext) async throws -> Response {
         // switch over the error type "requested" by the request, and trigger such error accordingly
         switch request.error {

Examples/ErrorHandling/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/Foundation/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/JSON/Lambda.swift

@@ -30,10 +30,6 @@ struct MyLambda: LambdaHandler {
     typealias Event = Request
     typealias Output = Response
 
-    init(context: LambdaInitializationContext) async throws {
-        // setup your resources that you want to reuse for every invocation here.
-    }
-
     func handle(_ event: Request, context: LambdaContext) async throws -> Response {
         // as an example, respond with the input event's reversed body
         Response(body: String(event.body.reversed()))

Examples/JSON/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/LocalDebugging/MyLambda/Lambda.swift

@@ -23,10 +23,6 @@ struct MyLambda: LambdaHandler {
     typealias Event = Request
     typealias Output = Response
 
-    init(context: LambdaInitializationContext) async throws {
-        // setup your resources that you want to reuse for every invocation here.
-    }
-
     func handle(_ request: Request, context: LambdaContext) async throws -> Response {
         // TODO: something useful
         Response(message: "Hello, \(request.name)!")

Examples/LocalDebugging/MyLambda/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/Testing/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 import PackageDescription
 

Examples/Testing/Sources/Lambda.swift

@@ -18,13 +18,6 @@ import AWSLambdaRuntime
 
 @main
 struct MyLambda: LambdaHandler {
-    typealias Event = String
-    typealias Output = String
-
-    init(context: LambdaInitializationContext) async throws {
-        // setup your resources that you want to reuse for every invocation here.
-    }
-
     func handle(_ event: String, context: LambdaContext) async throws -> String {
         // as an example, respond with the event's reversed body
         String(event.reversed())

Examples/Testing/Tests/LambdaTests.swift

@@ -18,9 +18,9 @@ import AWSLambdaTesting
 import XCTest
 
 class LambdaTest: XCTestCase {
-    func testIt() throws {
+    func testIt() async throws {
         let input = UUID().uuidString
-        let result = try Lambda.test(MyLambda.self, with: input)
+        let result = try await Lambda.test(MyLambda.self, with: input)
         XCTAssertEqual(result, String(input.reversed()))
     }
 }

Sources/AWSLambdaRuntime/Lambda+Codable.swift

@@ -19,7 +19,45 @@ import class Foundation.JSONEncoder
 import NIOCore
 import NIOFoundationCompat
 
-// MARK: - Codable support
+// MARK: - LambdaHandler Codable support
+
+/// Implementation of  a`ByteBuffer` to `Event` decoding.
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Event: Decodable {
+    @inlinable
+    public func decode(buffer: ByteBuffer) throws -> Event {
+        try self.decoder.decode(Event.self, from: buffer)
+    }
+}
+
+/// Implementation of  `Output` to `ByteBuffer` encoding.
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Output: Encodable {
+    @inlinable
+    public func encode(value: Output, into buffer: inout ByteBuffer) throws {
+        try self.encoder.encode(value, into: &buffer)
+    }
+}
+
+/// Default `ByteBuffer` to `Event` decoder using Foundation's `JSONDecoder`.
+/// Advanced users that want to inject their own codec can do it by overriding these functions.
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Event: Decodable {
+    public var decoder: LambdaCodableDecoder {
+        Lambda.defaultJSONDecoder
+    }
+}
+
+/// Default `Output` to `ByteBuffer` encoder using Foundation's `JSONEncoder`.
+/// Advanced users that want to inject their own codec can do it by overriding these functions.
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Output: Encodable {
+    public var encoder: LambdaCodableEncoder {
+        Lambda.defaultJSONEncoder
+    }
+}
+
+// MARK: - EventLoopLambdaHandler Codable support
 
 /// Implementation of  a`ByteBuffer` to `Event` decoding.
 extension EventLoopLambdaHandler where Event: Decodable {
@@ -32,8 +70,8 @@ extension EventLoopLambdaHandler where Event: Decodable {
 /// Implementation of  `Output` to `ByteBuffer` encoding.
 extension EventLoopLambdaHandler where Output: Encodable {
     @inlinable
-    public func encode(allocator: ByteBufferAllocator, value: Output) throws -> ByteBuffer? {
-        try self.encoder.encode(value, using: allocator)
+    public func encode(value: Output, into buffer: inout ByteBuffer) throws {
+        try self.encoder.encode(value, into: &buffer)
     }
 }
 
@@ -58,7 +96,7 @@ public protocol LambdaCodableDecoder {
 }
 
 public protocol LambdaCodableEncoder {
-    func encode<T: Encodable>(_ value: T, using allocator: ByteBufferAllocator) throws -> ByteBuffer
+    func encode<T: Encodable>(_ value: T, into buffer: inout ByteBuffer) throws
 }
 
 extension Lambda {
@@ -68,11 +106,4 @@ extension Lambda {
 
 extension JSONDecoder: LambdaCodableDecoder {}
 
-extension JSONEncoder: LambdaCodableEncoder {
-    public func encode<T>(_ value: T, using allocator: ByteBufferAllocator) throws -> ByteBuffer where T: Encodable {
-        // nio will resize the buffer if necessary
-        var buffer = allocator.buffer(capacity: 1024)
-        try self.encode(value, into: &buffer)
-        return buffer
-    }
-}
+extension JSONEncoder: LambdaCodableEncoder {}

Sources/AWSLambdaRuntimeCore/Lambda+String.swift

@@ -13,25 +13,46 @@
 //===----------------------------------------------------------------------===//
 import NIOCore
 
-extension EventLoopLambdaHandler where Event == String {
+// MARK: - LambdaHandler String support
+
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Event == String {
     /// Implementation of a `ByteBuffer` to `String` decoding.
     @inlinable
     public func decode(buffer: ByteBuffer) throws -> String {
-        var buffer = buffer
-        guard let string = buffer.readString(length: buffer.readableBytes) else {
-            fatalError("buffer.readString(length: buffer.readableBytes) failed")
+        guard let value = buffer.getString(at: buffer.readerIndex, length: buffer.readableBytes) else {
+            throw CodecError.invalidString
         }
-        return string
+        return value
     }
 }
 
-extension EventLoopLambdaHandler where Output == String {
+@available(macOS 12, iOS 15, tvOS 15, watchOS 8, *)
+extension LambdaHandler where Output == String {
     /// Implementation of `String` to `ByteBuffer` encoding.
     @inlinable
-    public func encode(allocator: ByteBufferAllocator, value: String) throws -> ByteBuffer? {
-        // FIXME: reusable buffer
-        var buffer = allocator.buffer(capacity: value.utf8.count)
+    public func encode(value: String, into buffer: inout ByteBuffer) throws {
+        buffer.writeString(value)
+    }
+}
+
+// MARK: - EventLoopLambdaHandler String support
+
+extension EventLoopLambdaHandler where Event == String {
+    /// Implementation of `String` to `ByteBuffer` encoding.
+    @inlinable
+    public func decode(buffer: ByteBuffer) throws -> String {
+        guard let value = buffer.getString(at: buffer.readerIndex, length: buffer.readableBytes) else {
+            throw CodecError.invalidString
+        }
+        return value
+    }
+}
+
+extension EventLoopLambdaHandler where Output == String {
+    /// Implementation of a `ByteBuffer` to `String` decoding.
+    @inlinable
+    public func encode(value: String, into buffer: inout ByteBuffer) throws {
         buffer.writeString(value)
-        return buffer
     }
 }