Merge branch 'ktor-mp'

Author: rdbatch

build.gradle

@@ -15,12 +15,30 @@ repositories {
 }
 
 kotlin {
-    macosX64("macos")
+    macosX64("macos") {
+        binaries {
+            executable('main', [DEBUG]) {
+                // Build a binary on the basis of the test compilation.
+                compilation = compilations.main
+
+                // Base name for the output file.
+                baseName = 'lambda-runtime'
+
+                // Custom entry point function.
+                entryPoint = 'com.batchofcode.lambdaruntime.main'
+
+                // Accessing the output file.
+                println("Executable path: ${outputFile.absolutePath}")
+            }
+
+        }
+    }
     linuxX64("linux")
 }
 
 dependencies {
     commonMainImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.1"
+    commonMainImplementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.11.0"
     commonMainImplementation "io.ktor:ktor-client-core:$ktor_version"
 
     commonTestImplementation "org.jetbrains.kotlin:kotlin-test-common:$kotlin_version"
@@ -29,13 +47,15 @@ dependencies {
     commonTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.2.1"
 
     macosMainImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.1'
+    macosMainImplementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.11.0"
     macosMainImplementation "io.ktor:ktor-client-core-native:$ktor_version"
     macosMainImplementation "io.ktor:ktor-client-curl:$ktor_version"
 
     macosTestApi "io.ktor:ktor-client-mock-native:$ktor_version"
     macosTestApi 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.1'
 
     linuxMainImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.1'
+    linuxMainImplementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.11.0"
     linuxMainImplementation "io.ktor:ktor-client-core-native:$ktor_version"
     linuxMainImplementation "io.ktor:ktor-client-curl:$ktor_version"
 
@@ -61,7 +81,7 @@ bintray {
     override = true
 //    publications = ['kotlinMultiplatform']
     filesSpec {
-        from 'build/publications/LambdaRuntime/module.json'
+        from 'build/publications/kotlinMultiplatform/module.json'
         into 'com/batchofcode/lambda-runtime-kotlin-native/' + project.version
         rename 'module.json', 'lambda-runtime-kotlin-native-' + project.version + '.module'
     }
@@ -88,11 +108,11 @@ bintrayUpload.doFirst {
 }
 
 task runProgram {
-    def buildType = 'debug' // Change to 'debug' to run application with debug symbols.
-    dependsOn "build"
+    dependsOn "macosBinaries"
     doLast {
-        def programFile = "build/bin/LambdaRuntime/main/${buildType}/executable/lambda-runtime-kotlin-native.kexe"
+        def programFile = "build/bin/macos/mainDebugExecutable/lambda-runtime.kexe"
         exec {
+            environment("AWS_LAMBDA_RUNTIME_API", "localhost:9000")
             executable programFile
             args ''
         }

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.import.noCommonSourceSets=false
-kotlin_version=1.3.30
-ktor_version=1.2.0-rc
+kotlin_version=1.3.31
+ktor_version=1.2.0

src/commonMain/kotlin/com/batchofcode/lambdaruntime/client/CommonAwsRuntimeClient.kt

@@ -2,31 +2,36 @@ package com.batchofcode.lambdaruntime.client
 
 import com.batchofcode.lambdaruntime.client.exception.BadRequestException
 import com.batchofcode.lambdaruntime.handler.InvocationRequest
-import com.batchofcode.lambdaruntime.http.KtorClient
+import com.batchofcode.lambdaruntime.util.containsKey
 import com.batchofcode.lambdaruntime.util.fromMap
 import io.ktor.client.HttpClient
-import io.ktor.client.request.get
 import io.ktor.client.request.post
+import io.ktor.client.request.request
 import io.ktor.client.request.url
 import io.ktor.client.response.HttpResponse
 import io.ktor.content.TextContent
 import io.ktor.http.ContentType
+import io.ktor.http.HttpMethod
 import kotlinx.io.core.use
+import kotlin.collections.set
 
-class CommonAwsRuntimeClient(private val client: HttpClient = KtorClient.client) {
+class CommonAwsRuntimeClient(private val client: HttpClient) {
     suspend fun run(handler: (InvocationRequest) -> String) {
         client.use { client ->
-            while (true) {
                 processRequests(client, handler)
-            }
+//            while (true) {
+//            }
         }
     }
 
     suspend fun processRequests(client: HttpClient, handler: (InvocationRequest) -> String) {
         val invocationHttpRequest =
-            client.get<HttpResponse>("http://${EnvironmentConfiguration.lambdaRuntimeApi}/2018-06-01/runtime/invocation/next")
+            client.request<HttpResponse>{
+                url("http://${EnvironmentConfiguration.lambdaRuntimeApi}/2018-06-01/runtime/invocation/next")
+                method = HttpMethod.Get
+            }
         try {
-            if (!invocationHttpRequest.headers.contains("Lambda-Runtime-Aws-Request-Id")) {
+            if (!invocationHttpRequest.headers.containsKey("Lambda-Runtime-Aws-Request-Id")) {
                 return
             }
             val invocationRequest = RequestMapper.mapRequest(invocationHttpRequest)
@@ -53,7 +58,7 @@ class CommonAwsRuntimeClient(private val client: HttpClient = KtorClient.client)
             client.post<Unit> {
                 url("http://${EnvironmentConfiguration.lambdaRuntimeApi}/2018-06-01/runtime/invocation/${invocationRequest.requestId}/response")
                 headers.fromMap(responseHeaders)
-                body = TextContent(handlerResponse, ContentType.Application.Json)
+                body = TextContent(handlerResponse, ContentType.Text.Any)
             }
         } catch (ex: BadRequestException) {
             val errorPayload = "{" +

src/commonMain/kotlin/com/batchofcode/lambdaruntime/http/KtorClient.kt

@@ -2,6 +2,6 @@ package com.batchofcode.lambdaruntime.http
 
 import io.ktor.client.HttpClient
 
-expect object KtorClient {
-    val client: HttpClient
+expect class KtorClient {
+    fun getClient(): HttpClient
 }

src/commonMain/kotlin/com/batchofcode/lambdaruntime/util/HeaderHelper.kt

@@ -1,10 +1,15 @@
 package com.batchofcode.lambdaruntime.util
 
+import io.ktor.http.Headers
 import io.ktor.http.HeadersBuilder
 
 fun HeadersBuilder.fromMap(headers: Map<String, String>) {
     this.clear()
     headers.forEach {
         this.append(it.key, it.value)
     }
+}
+
+fun Headers.containsKey(key: String): Boolean {
+    return this.entries().any { it.key == key }
 }

src/linuxMain/kotlin/com/batchofcode/lambdaruntime/client/LambdaRuntimeClient.kt

@@ -1,11 +1,13 @@
 package com.batchofcode.lambdaruntime.client
 
-import kotlinx.coroutines.runBlocking
 import com.batchofcode.lambdaruntime.handler.InvocationRequest
 import com.batchofcode.lambdaruntime.http.KtorClient
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
 actual class LambdaRuntimeClient {
     actual fun run(handler: (InvocationRequest) -> String) {
-        runBlocking { CommonAwsRuntimeClient(KtorClient.client).run(handler) }
+        GlobalScope.launch(Dispatchers.Unconfined) { CommonAwsRuntimeClient(KtorClient().getClient()).run(handler) }
     }
 }

src/linuxMain/kotlin/com/batchofcode/lambdaruntime/http/KtorClient.kt

@@ -3,6 +3,7 @@ package com.batchofcode.lambdaruntime.http
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.curl.Curl
 
-actual object KtorClient {
-    actual val client = HttpClient(Curl.create())
+actual class KtorClient {
+    private val client = HttpClient(Curl.create())
+    actual fun getClient() = client
 }

src/macosMain/kotlin/com/batchofcode/lambdaruntime/LocalRunner.kt

@@ -0,0 +1,10 @@
+package com.batchofcode.lambdaruntime
+
+import com.batchofcode.lambdaruntime.client.LambdaRuntimeClient
+
+fun main() {
+    LambdaRuntimeClient().run {
+        println(it)
+        "RESPONSE"
+    }
+}

src/macosMain/kotlin/com/batchofcode/lambdaruntime/client/LambdaRuntimeClient.kt

@@ -1,12 +1,12 @@
 package com.batchofcode.lambdaruntime.client
 
-import kotlinx.coroutines.runBlocking
 import com.batchofcode.lambdaruntime.handler.InvocationRequest
 import com.batchofcode.lambdaruntime.http.KtorClient
+import kotlinx.coroutines.runBlocking
 
 actual class LambdaRuntimeClient {
     actual fun run(handler: (InvocationRequest) -> String) {
         println("WARNING! Runtime not supported on MacOS Platform.")
-        runBlocking { CommonAwsRuntimeClient(KtorClient.client).run(handler) }
+        runBlocking { CommonAwsRuntimeClient(KtorClient().getClient()).run(handler) }
     }
 }

src/macosMain/kotlin/com/batchofcode/lambdaruntime/http/KtorClient.kt

@@ -3,6 +3,7 @@ package com.batchofcode.lambdaruntime.http
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.curl.Curl
 
-actual object KtorClient {
-    actual val client = HttpClient(Curl.create())
+actual class KtorClient {
+    private val client = HttpClient(Curl.create())
+    actual fun getClient() = client
 }