Merge branch 'main' into dependabot/gradle/io.github.oshai-kotlin-logging-7.0.11

Author: kpavlov

.github/workflows/gradle-publish.yml

@@ -9,7 +9,7 @@ name: Release
 
 on:
   release:
-    types: [ created ]
+    types: [ published ]
 
 jobs:
   build:
@@ -130,4 +130,4 @@ jobs:
           name: jreleaser-logs
           path: |
             build/jreleaser/trace.log
-            build/jreleaser/output.properties
+            build/jreleaser/output.properties

.github/workflows/publish-client-and-server.yml

@@ -0,0 +1,58 @@
+name: Release Client and Server
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: macos-latest
+    environment: release
+
+    permissions:
+      contents: write
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Verify publication configuration
+        run: ./gradlew kotlin-sdk-server:jreleaserConfig kotlin-sdk-client:jreleaserConfig
+        env:
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build with Gradle
+        run: ./gradlew clean kotlin-sdk-server:assemble kotlin-sdk-client:assemble
+        env:
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+
+      - name: Publish to Maven Central Portal
+        id: publish
+        run: ./gradlew kotlin-sdk-server:publish kotlin-sdk-client:publish kotlin-sdk-server:jreleaserFullRelease kotlin-sdk-client:jreleaserFullRelease --info --stacktrace -Djreleaser.verbose=true
+        env:
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}

buildSrc/src/main/kotlin/mcp.jreleaser.gradle.kts

@@ -63,4 +63,13 @@ jreleaser {
             files = false
         }
     }
+
+    release {
+        github {
+            skipRelease = true
+            skipTag = true
+            overwrite = false
+            token = "none"
+        }
+    }
 }

gradle/libs.versions.toml

@@ -17,6 +17,7 @@ jreleaser = "1.19.0"
 binaryCompatibilityValidatorPlugin = "0.18.1"
 slf4j = "2.0.17"
 kotest = "5.9.1"
+awaitility = "4.3.0"
 
 # Samples
 mcp-kotlin = "0.7.0"
@@ -34,6 +35,7 @@ jreleaser-gradle = { module = "org.jreleaser:jreleaser-gradle-plugin", version.r
 # Kotlinx libraries
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-coroutines-core-wasm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-wasm-js", version.ref = "coroutines" }
 kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io" }
 kotlinx-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "collections-immutable" }
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "logging" }
@@ -45,11 +47,12 @@ ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", v
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
 
 # Testing
+awaitility = { group = "org.awaitility", name = "awaitility-kotlin", version.ref = "awaitility" }
+kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
 ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
+ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 
 # Samples
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }

kotlin-sdk-core/build.gradle.kts

@@ -53,5 +53,9 @@ kotlin {
                 runtimeOnly(libs.slf4j.simple)
             }
         }
+
+        wasmJsMain.dependencies {
+            api(libs.kotlinx.coroutines.core.wasm) // workaround for wasm server
+        }
     }
 }

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt

@@ -36,11 +36,10 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.serializer
-import kotlin.collections.get
 import kotlin.reflect.KType
 import kotlin.reflect.typeOf
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 private val LOGGER = KotlinLogging.logger { }
 
@@ -85,7 +84,7 @@ public open class ProtocolOptions(
 /**
  * The default request timeout.
  */
-public val DEFAULT_REQUEST_TIMEOUT: Duration = 60000.milliseconds
+public val DEFAULT_REQUEST_TIMEOUT: Duration = 60.seconds
 
 /**
  * Options that can be given per request.

kotlin-sdk-test/build.gradle.kts

@@ -24,6 +24,7 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation(kotlin("test-junit5"))
+                implementation(libs.awaitility)
                 runtimeOnly(libs.slf4j.simple)
             }
         }

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/KotlinTestBase.kt

@@ -17,6 +17,7 @@ import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
 import io.modelcontextprotocol.kotlin.sdk.server.mcp
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
+import org.awaitility.kotlin.await
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import kotlin.time.Duration.Companion.seconds
@@ -27,7 +28,7 @@ import io.ktor.server.sse.SSE as ServerSSE
 abstract class KotlinTestBase {
 
     protected val host = "localhost"
-    protected abstract val port: Int
+    protected var port: Int = 0
 
     protected lateinit var server: Server
     protected lateinit var client: Client
@@ -39,6 +40,12 @@ abstract class KotlinTestBase {
     @BeforeEach
     fun setUp() {
         setupServer()
+        await
+            .ignoreExceptions()
+            .until {
+                port = runBlocking { serverEngine.engine.resolvedConnectors().first().port }
+                port != 0
+            }
         runBlocking {
             setupClient()
         }

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/PromptEdgeCasesTest.kt

@@ -7,9 +7,10 @@ import io.modelcontextprotocol.kotlin.sdk.PromptMessage
 import io.modelcontextprotocol.kotlin.sdk.Role
 import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
 import io.modelcontextprotocol.kotlin.sdk.TextContent
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.assertEquals
@@ -18,8 +19,6 @@ import kotlin.test.assertTrue
 
 class PromptEdgeCasesTest : KotlinTestBase() {
 
-    override val port = 3008
-
     private val basicPromptName = "basic-prompt"
     private val basicPromptDescription = "A basic prompt for testing"
 
@@ -183,7 +182,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
     }
 
     @Test
-    fun testBasicPrompt() = runTest {
+    fun testBasicPrompt() = runBlocking(Dispatchers.IO) {
         val testName = "Alice"
         val result = client.getPrompt(
             GetPromptRequest(
@@ -215,7 +214,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
     }
 
     @Test
-    fun testComplexPromptWithManyArguments() = runTest {
+    fun testComplexPromptWithManyArguments() = runBlocking(Dispatchers.IO) {
         val arguments = (1..10).associate { i -> "arg$i" to "value$i" }
 
         val result = client.getPrompt(
@@ -253,7 +252,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
     }
 
     @Test
-    fun testLargePrompt() = runTest {
+    fun testLargePrompt() = runBlocking(Dispatchers.IO) {
         val result = client.getPrompt(
             GetPromptRequest(
                 name = largePromptName,
@@ -275,7 +274,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
     }
 
     @Test
-    fun testSpecialCharacters() = runTest {
+    fun testSpecialCharacters() = runBlocking(Dispatchers.IO) {
         val result = client.getPrompt(
             GetPromptRequest(
                 name = specialCharsPromptName,

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/PromptIntegrationTest.kt

@@ -9,7 +9,7 @@ import io.modelcontextprotocol.kotlin.sdk.PromptMessageContent
 import io.modelcontextprotocol.kotlin.sdk.Role
 import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
 import io.modelcontextprotocol.kotlin.sdk.TextContent
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -19,7 +19,6 @@ import kotlin.test.assertTrue
 
 class PromptIntegrationTest : KotlinTestBase() {
 
-    override val port = 3004
     private val testPromptName = "greeting"
     private val testPromptDescription = "A simple greeting prompt"
     private val complexPromptName = "multimodal-prompt"
@@ -219,7 +218,7 @@ class PromptIntegrationTest : KotlinTestBase() {
     }
 
     @Test
-    fun testListPrompts() = runTest {
+    fun testListPrompts() = runBlocking(Dispatchers.IO) {
         val result = client.listPrompts()
 
         assertNotNull(result, "List prompts result should not be null")
@@ -247,7 +246,7 @@ class PromptIntegrationTest : KotlinTestBase() {
     }
 
     @Test
-    fun testGetPrompt() = runTest {
+    fun testGetPrompt() = runBlocking(Dispatchers.IO) {
         val testName = "Alice"
         val result = client.getPrompt(
             GetPromptRequest(
@@ -290,7 +289,7 @@ class PromptIntegrationTest : KotlinTestBase() {
     }
 
     @Test
-    fun testMissingRequiredArguments() = runTest {
+    fun testMissingRequiredArguments() = runBlocking(Dispatchers.IO) {
         val promptsList = client.listPrompts()
         assertNotNull(promptsList, "Prompts list should not be null")
         val strictPrompt = promptsList.prompts.find { it.name == strictPromptName }
@@ -364,7 +363,7 @@ class PromptIntegrationTest : KotlinTestBase() {
     }
 
     @Test
-    fun testComplexContentTypes() = runTest {
+    fun testComplexContentTypes() = runBlocking(Dispatchers.IO) {
         val topic = "artificial intelligence"
         val result = client.getPrompt(
             GetPromptRequest(
@@ -418,7 +417,7 @@ class PromptIntegrationTest : KotlinTestBase() {
     }
 
     @Test
-    fun testMultipleMessagesAndRoles() = runTest {
+    fun testMultipleMessagesAndRoles() = runBlocking(Dispatchers.IO) {
         val topic = "climate change"
         val result = client.getPrompt(
             GetPromptRequest(