fixup! Introduce Kotlin integration tests

Signed-off-by: Sergey Karpov <[email protected]>

Author: skarpovdev

.gitignore

@@ -3,7 +3,6 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-/src/jvmTest/resources/typescript-sdk/
 
 ### IntelliJ IDEA ###
 .idea/modules.xml

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

@@ -1,6 +1,5 @@
 package io.modelcontextprotocol.kotlin.sdk.integration.typescript
 
-import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import java.io.BufferedReader
 import java.io.File
@@ -16,7 +15,11 @@ abstract class TypeScriptTestBase {
 
     companion object {
         @JvmStatic
-        protected val sdkDir = File("src/jvmTest/resources/typescript-sdk")
+        private val tempRootDir: File =
+            java.nio.file.Files.createTempDirectory("typescript-sdk-").toFile().apply { deleteOnExit() }
+
+        @JvmStatic
+        protected val sdkDir: File = File(tempRootDir, "typescript-sdk")
 
         /**
          * clone TypeScript SDK and install dependencies
@@ -27,7 +30,7 @@ abstract class TypeScriptTestBase {
             println("Cloning TypeScript SDK repository")
             if (!sdkDir.exists()) {
                 val cloneCommand =
-                    "git clone --depth 1 https://github.com/modelcontextprotocol/typescript-sdk.git src/jvmTest/resources/typescript-sdk"
+                    "git clone --depth 1 https://github.com/modelcontextprotocol/typescript-sdk.git ${sdkDir.absolutePath}"
                 val process = ProcessBuilder()
                     .command("bash", "-c", cloneCommand)
                     .redirectErrorStream(true)
@@ -42,17 +45,11 @@ abstract class TypeScriptTestBase {
             executeCommand("npm install", sdkDir)
         }
 
-        @JvmStatic
-        @AfterAll
-        fun removeTypeScriptSDK() {
-            sdkDir.deleteRecursively()
-        }
-
         @JvmStatic
         protected fun executeCommand(command: String, workingDir: File): String {
             // Prefer running TypeScript via ts-node to avoid npx network delays on CI
             val process = ProcessBuilder()
-                .command("bash", "-c", command)
+                .command("bash", "-c", "TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' $command")
                 .directory(workingDir)
                 .redirectErrorStream(true)
                 .start()
@@ -126,7 +123,7 @@ abstract class TypeScriptTestBase {
 
     protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String {
         val process = ProcessBuilder()
-            .command("bash", "-c", command)
+            .command("bash", "-c", "TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' $command")
             .directory(workingDir)
             .redirectErrorStream(true)
             .start()

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils/myClient.ts

@@ -1,15 +1,27 @@
 // @ts-ignore
-import {Client} from "../../../../../../../resources/typescript-sdk/src/client";
-// @ts-ignore
-import {StreamableHTTPClientTransport} from "../../../../../../../resources/typescript-sdk/src/client/streamableHttp.js";
-
 const args = process.argv.slice(2);
 const serverUrl = args[0] || 'http://localhost:3001/mcp';
 const toolName = args[1];
 const toolArgs = args.slice(2);
 const PROTOCOL_VERSION = "2024-11-05";
 
+// @ts-ignore
 async function main() {
+    // @ts-ignore
+    const sdkDir = process.env.TYPESCRIPT_SDK_DIR;
+    let Client: any;
+    let StreamableHTTPClientTransport: any;
+    if (sdkDir) {
+        // @ts-ignore
+        ({Client} = await import(`${sdkDir}/src/client`));
+        // @ts-ignore
+        ({StreamableHTTPClientTransport} = await import(`${sdkDir}/src/client/streamableHttp.js`));
+    } else {
+        // @ts-ignore
+        ({Client} = await import("../../../../../../../resources/typescript-sdk/src/client"));
+        // @ts-ignore
+        ({StreamableHTTPClientTransport} = await import("../../../../../../../resources/typescript-sdk/src/client/streamableHttp.js"));
+    }
     if (!toolName) {
         console.log('Usage: npx tsx myClient.ts [server-url] <tool-name> [tool-args...]');
         console.log('Using default server URL:', serverUrl);
@@ -44,6 +56,7 @@ async function main() {
         const tool = tools.find((t: { name: string; }) => t.name === toolName);
         if (!tool) {
             console.error(`Tool "${toolName}" not found`);
+            // @ts-ignore
             process.exit(1);
         }
 
@@ -80,6 +93,7 @@ async function main() {
 
     } catch (error) {
         console.error('Error:', error);
+        // @ts-ignore
         process.exit(1);
     } finally {
         await client.close();
@@ -89,5 +103,6 @@ async function main() {
 
 main().catch(error => {
     console.error('Unhandled error:', error);
+    // @ts-ignore
     process.exit(1);
 });