chore: ktor 3.0.0-Beta2 and refactor wasm support

Author: sureshg

CHANGELOG.md

@@ -8,40 +8,5 @@
 [View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.8.0...v0.8.1)
 
 
-## [v0.8.0](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.8.0) (2023-07-29)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.8...v0.8.0)
-
-
-## [v0.7.8](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.8) (2023-07-23)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.7...v0.7.8)
-
-
-## [v0.7.7](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.7) (2023-07-21)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.6...v0.7.7)
-
-
-## [v0.7.6](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.6) (2023-07-21)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.5...v0.7.6)
-
-
-## [v0.7.5](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.5) (2023-07-11)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.1...v0.7.5)
-
-
-## [v0.7.1](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.1) (2023-07-06)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.7.0...v0.7.1)
-
-
-## [v0.7.0](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.7.0) (2023-07-03)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.6.0...v0.7.0)
-
-
-## [v0.6.0](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.6.0) (2023-07-03)
-[View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/v0.5.0...v0.6.0)
-
-**Merged pull requests:**
-
-- chore\(deps\): bump dependabot/fetch\-metadata from 1.5.1 to 1.6.0 [\#13](https://github.com/sureshg/kotlin-mpp-playground/pull/13) ([@dependabot[bot]](https://github.com/apps/dependabot))
-
 ## [v0.5.0](https://github.com/sureshg/kotlin-mpp-playground/tree/v0.5.0) (2023-06-21)
 [View commits](https://github.com/sureshg/kotlin-mpp-playground/compare/dfffbe4cfab7b2f2a93db885ec8a139c960a4221...v0.5.0)

README.md

@@ -50,6 +50,7 @@ $ ./gradlew :backend:jvm:run
   $ sdk u java graalvm-ce-dev
   $ ./gradlew :backend:jvm:nativeCompile
   $ backend/jvm/build/native/nativeCompile/jvm
+  $ strings -a backend/jvm/build/native/nativeCompile/jvm | grep "cn="
 
   # To generate the native image configurations
   $ ./gradlew :backend:jvm:run -Pagent
@@ -110,6 +111,7 @@ $ ./gradlew :backend:jvm:run
 
   ```bash
   $ ./gradlew :backend:jvm:test -PktorTest
+  $ ./gradlew :backend:jvm:test -Pk8sTest
   $ ./gradlew :backend:jvm:jvmRun -DmainClass=dev.suresh.lang.SysCallKt --quiet
   ```
 
@@ -124,7 +126,8 @@ $ ./gradlew :backend:jvm:run
 
   ```bash
   # Kotlin JS
-  $ ./gradlew :web:js:jsBrowserProductionRun -t
+  $ ./gradlew :web:jsBrowserProductionRun -t
+  $ ./gradlew :web:wasmJsBrowserProductionRun -t
   $ ./gradlew kotlinUpgradePackageLock
 
   # Kobweb

backend/jvm/build.gradle.kts

@@ -131,7 +131,6 @@ tasks {
         }
       }
 
-  // Copy webapps to resources
   processResources {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
     dependsOn(copyTasks)
@@ -155,6 +154,7 @@ dependencies {
   implementation(libs.ktor.server.content.negotiation)
   implementation(libs.ktor.server.metrics.micrometer)
   implementation(libs.ktor.server.call.logging)
+  implementation(libs.ktor.server.call.id)
   implementation(libs.ktor.server.status.pages)
   implementation(libs.ktor.server.default.headers)
   implementation(libs.ktor.server.forwarded.header)
@@ -170,6 +170,7 @@ dependencies {
   implementation(libs.ktor.server.auth)
   implementation(libs.ktor.server.auth.jwt)
   implementation(libs.ktor.server.websockets)
+  implementation(libs.ktor.server.sse)
   implementation(libs.ktor.serialization.json)
 
   // Client dependencies
@@ -207,16 +208,16 @@ dependencies {
   implementation(libs.logback.classic)
 
   // Testing
-  testImplementation(libs.ktor.server.tests)
+  testImplementation(libs.ktor.server.test.host)
   testImplementation(libs.testcontainers.junit5)
   testImplementation(libs.testcontainers.postgresql)
   testImplementation(libs.testcontainers.k3s)
   testImplementation(libs.kubernetes.client)
   testImplementation(libs.konsist)
 
   // Copy js and wasm apps
-  jsApp(project(path = projects.web.js.dependencyProject.path, configuration = "jsApp"))
-  wasmApp(project(path = projects.web.wasm.dependencyProject.path, configuration = "wasmApp"))
+  jsApp(project(path = projects.web.dependencyProject.path, configuration = "jsApp"))
+  wasmApp(project(path = projects.web.dependencyProject.path, configuration = "wasmApp"))
 
   // Specify the classifier using variantOf
   // implementation(variantOf(libs.lwjgl.opengl) { classifier("natives-linux") })

backend/jvm/src/main/kotlin/dev/suresh/plugins/Http.kt

@@ -5,7 +5,7 @@ import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.*
 import io.ktor.server.plugins.autohead.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.plugins.defaultheaders.*

backend/jvm/src/main/kotlin/dev/suresh/routes/Admin.kt

@@ -1,12 +1,11 @@
 package dev.suresh.routes
 
 import BuildConfig
-import io.ktor.server.application.*
 import io.ktor.server.plugins.swagger.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
-fun Route.adminRoutes() {
+fun Routing.adminRoutes() {
   swaggerUI(path = "swagger", swaggerFile = "openapi/documentation.yaml") {
     version = BuildConfig.swaggerUi
     customStyle("https://unpkg.com/swagger-ui-themes@3.0.1/themes/3.x/theme-flattop.css")

backend/jvm/src/main/kotlin/dev/suresh/routes/Mgmt.kt

@@ -28,7 +28,7 @@ val mutex = Mutex()
 
 val docRoot = Path(System.getProperty("java.io.tmpdir"))
 
-fun Route.mgmtRoutes() {
+fun Routing.mgmtRoutes() {
 
   staticFiles(remotePath = "/tmp", dir = docRoot.toFile())
 

backend/jvm/src/main/kotlin/dev/suresh/routes/Service.kt

@@ -14,31 +14,19 @@ import java.io.Writer
 
 private val logger = KotlinLogging.logger {}
 
-fun Route.services() {
-  get("/ffm") {
-    call.respondLogStream {
-      FFM.memoryLayout()
-    }
-  }
+fun Routing.services() {
+  get("/ffm") { call.respondLogStream { FFM.memoryLayout() } }
 
-  get("/vthreads") {
-    call.respondLogStream {
-      VThread.virtualThreads()
-    }
-  }
+  get("/vthreads") { call.respondLogStream { VThread.virtualThreads() } }
 
-  get("/jfr") {
-    call.respondLogStream {
-      JFR.recordingStream()
-    }
-  }
+  get("/jfr") { call.respondLogStream { JFR.recordingStream() } }
 }
 
 suspend fun ApplicationCall.respondLogStream(
     contentType: ContentType = ContentType.Text.EventStream,
-    block: suspend context(KLogger) Writer.() -> Unit
+    block:
+        suspend context(KLogger)
+        Writer.() -> Unit
 ) {
-  respondTextWriter(contentType = contentType) {
-    block(RespLogger(this, logger), this)
-  }
+  respondTextWriter(contentType = contentType) { block(RespLogger(this, logger), this) }
 }

backend/jvm/src/main/kotlin/dev/suresh/routes/Webapp.kt

@@ -5,11 +5,11 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
-fun Route.webApp() {
+fun Routing.webApp() {
   webApp("/app", "app")
 }
 
-fun Route.webApp(remotePath: String, basePackage: String) {
+fun Routing.webApp(remotePath: String, basePackage: String) {
   staticResources(remotePath, basePackage) {
     exclude { it.path.endsWith(".log") }
     default("index.html")

backend/jvm/src/main/resources/META-INF/native-image/reachability-metadata.json

@@ -166,21 +166,13 @@
       "type":"io.ktor.server.application.Application"
     },
     {
-      "type":"io.ktor.server.application.PluginBuilder$onDefaultPhaseWithMessage$1",
-      "methods":[{"name":"invoke","parameterTypes":["io.ktor.util.pipeline.Pipeline"] }]
+      "type":"io.ktor.server.application.PluginBuilder",
+      "methods":[{"name":"onDefaultPhaseWithMessage","parameterTypes":["java.util.List","io.ktor.util.pipeline.PipelinePhase","java.lang.String","kotlin.jvm.functions.Function2","kotlin.jvm.functions.Function4"] }]
     },
     {
       "type":"io.ktor.server.application.hooks.CallFailed",
       "methods":[{"name":"install","parameterTypes":["io.ktor.server.application.ApplicationCallPipeline","kotlin.jvm.functions.Function3"] }]
     },
-    {
-      "type":"io.ktor.server.application.hooks.CallFailed$install$1",
-      "fields":[{"name":"label"}]
-    },
-    {
-      "type":"io.ktor.server.application.hooks.CallFailed$install$1$1",
-      "fields":[{"name":"label"}]
-    },
     {
       "type":"io.ktor.server.application.hooks.CallSetup",
       "methods":[{"name":"install","parameterTypes":["io.ktor.server.application.ApplicationCallPipeline","kotlin.jvm.functions.Function2"] }]
@@ -196,29 +188,13 @@
       "type":"io.ktor.server.engine.BaseApplicationEngineKt$installDefaultTransformationChecker$1",
       "fields":[{"name":"label"}]
     },
-    {
-      "type":"io.ktor.server.engine.DefaultEnginePipelineKt$defaultEnginePipeline$1",
-      "fields":[{"name":"label"}]
-    },
-    {
-      "type":"io.ktor.server.engine.DefaultEnginePipelineKt$defaultEnginePipeline$1$invokeSuspend$$inlined$execute$1",
-      "fields":[{"name":"label"}]
-    },
     {
       "type":"io.ktor.server.netty.NettyApplicationCall",
       "fields":[{"name":"messageReleased"}]
     },
     {
       "type":"io.ktor.server.netty.NettyApplicationCallHandler"
     },
-    {
-      "type":"io.ktor.server.netty.NettyApplicationCallHandler$handleRequest$1",
-      "fields":[{"name":"label"}]
-    },
-    {
-      "type":"io.ktor.server.netty.NettyApplicationCallHandler$handleRequest$1$invokeSuspend$$inlined$execute$1",
-      "fields":[{"name":"label"}]
-    },
     {
       "type":"io.ktor.server.netty.NettyChannelInitializer"
     },
@@ -238,56 +214,35 @@
       "type":"io.ktor.server.netty.http1.NettyHttp1Handler"
     },
     {
-      "type":"io.ktor.server.plugins.callloging.CallLoggingKt$logCallsWithMDC$1",
+      "type":"io.ktor.server.plugins.calllogging.CallLoggingKt$logCallsWithMDC$1$invokeSuspend$$inlined$withMDC$1",
       "fields":[{"name":"label"}]
     },
     {
-      "type":"io.ktor.server.plugins.callloging.CallLoggingKt$logCallsWithMDC$1$invokeSuspend$$inlined$withMDC$1",
-      "fields":[{"name":"label"}]
-    },
-    {
-      "type":"io.ktor.server.plugins.callloging.MDCHookKt$MDCHook$1",
+      "type":"io.ktor.server.plugins.calllogging.MDCHookKt$MDCHook$1",
       "methods":[{"name":"install","parameterTypes":["io.ktor.server.application.ApplicationCallPipeline","kotlin.jvm.functions.Function3"] }]
     },
-    {
-      "type":"io.ktor.server.plugins.callloging.MDCHookKt$MDCHook$1$install$1",
-      "fields":[{"name":"label"}]
-    },
     {
       "type":"io.ktor.server.plugins.statuspages.BeforeFallback",
       "methods":[{"name":"install","parameterTypes":["io.ktor.server.application.ApplicationCallPipeline","kotlin.jvm.functions.Function2"] }]
     },
     {
-      "type":"io.ktor.server.routing.Routing$Plugin",
+      "type":"io.ktor.server.routing.RoutingRoot$Plugin",
       "methods":[{"name":"install","parameterTypes":["io.ktor.server.application.Application","kotlin.jvm.functions.Function1"] }]
     },
     {
       "type":"io.ktor.util.collections.CopyOnWriteHashMap",
       "fields":[{"name":"current"}]
     },
     {
-      "type":"io.ktor.utils.io.ByteBufferChannel",
-      "fields":[{"name":"_closed"},{"name":"_readOp"},{"name":"_state"},{"name":"_writeOp"}]
-    },
-    {
-      "type":"io.ktor.utils.io.core.internal.ChunkBuffer",
-      "fields":[{"name":"nextRef"},{"name":"refCount"}]
-    },
-    {
-      "type":"io.ktor.utils.io.internal.CancellableReusableContinuation",
-      "fields":[{"name":"jobCancellationHandler"},{"name":"state"}]
-    },
-    {
-      "type":"io.ktor.utils.io.internal.RingBufferCapacity",
-      "fields":[{"name":"_availableForRead$internal"},{"name":"_availableForWrite$internal"},{"name":"_pendingToFlush"}]
+      "type":"io.ktor.util.internal.LockFreeLinkedListNode",
+      "fields":[{"name":"_next"},{"name":"_prev"},{"name":"_removedRef"}]
     },
     {
-      "type":"io.ktor.utils.io.jvm.javaio.BlockingAdapter",
-      "fields":[{"name":"state"}]
+      "type":"io.ktor.utils.io.ByteChannel",
+      "fields":[{"name":"_closedCause"},{"name":"suspensionSlot"}]
     },
     {
-      "type":"io.ktor.utils.io.jvm.javaio.PollersKt",
-      "methods":[{"name":"isParkingAllowed","parameterTypes":[] },{"name":"prohibitParking","parameterTypes":[] }]
+      "type":"io.ktor.utils.io.jvm.javaio.PollersKt"
     },
     {
       "type":"io.ktor.utils.io.pool.DefaultPool",
@@ -650,10 +605,6 @@
       "type":"java.util.concurrent.atomic.Striped64",
       "fields":[{"name":"base"},{"name":"cellsBusy"}]
     },
-    {
-      "type":"java.util.concurrent.atomic.Striped64$Cell",
-      "fields":[{"name":"value"}]
-    },
     {
       "type":"java.util.logging.LogManager",
       "methods":[{"name":"getLoggingMXBean","parameterTypes":[] }]
@@ -777,10 +728,6 @@
       "type":"kotlinx.coroutines.EventLoopImplBase",
       "fields":[{"name":"_delayed$volatile"},{"name":"_isCompleted$volatile"},{"name":"_queue$volatile"}]
     },
-    {
-      "type":"kotlinx.coroutines.InvokeOnCancelling",
-      "fields":[{"name":"_invoked$volatile"}]
-    },
     {
       "type":"kotlinx.coroutines.JobSupport",
       "fields":[{"name":"_parentHandle$volatile"},{"name":"_state$volatile"}]
@@ -794,8 +741,19 @@
       "fields":[{"name":"_closeCause$volatile"},{"name":"bufferEnd$volatile"},{"name":"bufferEndSegment$volatile"},{"name":"closeHandler$volatile"},{"name":"completedExpandBuffersAndPauseFlag$volatile"},{"name":"receiveSegment$volatile"},{"name":"receivers$volatile"},{"name":"sendSegment$volatile"},{"name":"sendersAndCloseStatus$volatile"}]
     },
     {
-      "type":"kotlinx.coroutines.internal.AtomicOp",
-      "fields":[{"name":"_consensus$volatile"}]
+      "type":"kotlinx.coroutines.debug.internal.ByteBuddyDynamicAttach"
+    },
+    {
+      "type":"kotlinx.coroutines.debug.internal.ConcurrentWeakMap",
+      "fields":[{"name":"_size$volatile"},{"name":"core$volatile"}]
+    },
+    {
+      "type":"kotlinx.coroutines.debug.internal.ConcurrentWeakMap$Core",
+      "fields":[{"name":"load$volatile"}]
+    },
+    {
+      "type":"kotlinx.coroutines.debug.internal.DebugProbesImpl$DebugProbesImpl$VolatileWrapper$atomicfu$private",
+      "fields":[{"name":"installations$volatile"},{"name":"sequenceNumber$volatile"}]
     },
     {
       "type":"kotlinx.coroutines.internal.ConcurrentLinkedListNode",
@@ -1067,10 +1025,10 @@
     "glob":"app\/js\/index.html"
   },{
     "module":"",
-    "glob":"app\/js\/js-app.js"
+    "glob":"app\/js\/logo\/kotlin-logo.svg"
   },{
     "module":"",
-    "glob":"app\/js\/logo\/kotlin-logo.svg"
+    "glob":"app\/js\/web.js"
   },{
     "module":"",
     "glob":"app\/wasm\/css\/app.css"
@@ -1079,13 +1037,13 @@
     "glob":"app\/wasm\/index.html"
   },{
     "module":"",
-    "glob":"app\/wasm\/logo\/kotlin-logo.svg"
+    "glob":"app\/wasm\/kotlin-mpp-playground-web-wasm-js.wasm"
   },{
     "module":"",
-    "glob":"app\/wasm\/wasm-app.js"
+    "glob":"app\/wasm\/logo\/kotlin-logo.svg"
   },{
     "module":"",
-    "glob":"app\/wasm\/wasm-app.wasm"
+    "glob":"app\/wasm\/web.js"
   },{
     "module":"",
     "glob":"application.conf"

backend/jvm/src/test/kotlin/dev/suresh/AppTests.kt

@@ -13,7 +13,7 @@ import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.config.*
 import io.ktor.server.plugins.callid.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*