Skip to content

fix tests after typescript-sdk became modulized #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Fuud wants to merge 1 commit into from
Closed

fix tests after typescript-sdk became modulized #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions ...t/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/OldSchemaTsTestBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,15 @@ abstract class OldSchemaTsTestBase {
}
}

println("Installing TypeScript SDK dependencies")
executeCommand("npm install", sdkDir, allowFailure = false, timeoutSeconds = null)
println("Installing and build TypeScript SDK dependencies")
executeCommand(
"" +
"corepack enable && " +
"corepack install && " +
"pnpm install && " +
"pnpm build:all",
sdkDir, allowFailure = false, timeoutSeconds = null
)
}

@JvmStatic
Expand Down Expand Up @@ -248,21 +255,21 @@ abstract class OldSchemaTsTestBase {
.command(
"cmd.exe",
"/c",
"set MCP_PORT=$port && set NODE_PATH=${sdkDir.absolutePath}\\node_modules && npx --prefix \"${sdkDir.absolutePath}\" tsx \"$localServerPath\"",
"set MCP_PORT=$port && pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/server/tsconfig.json\" \"$localServerPath\"",
)
} else {
ProcessBuilder()
.command(
"bash",
"-c",
"MCP_PORT=$port NODE_PATH='${sdkDir.absolutePath}/node_modules' npx --prefix '${sdkDir.absolutePath}' tsx \"$localServerPath\"",
"MCP_PORT=$port && pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/server/tsconfig.json' \"$localServerPath\"",
)
}

processBuilder.environment()["TYPESCRIPT_SDK_DIR"] = sdkDir.absolutePath

val process = processBuilder
.directory(tsClientDir)
.directory(sdkDir)
.redirectErrorStream(true)
.start()

Expand Down Expand Up @@ -314,19 +321,19 @@ abstract class OldSchemaTsTestBase {
.command(
"cmd.exe",
"/c",
"set NODE_PATH=${sdkDir.absolutePath}\\node_modules && npx --prefix \"${sdkDir.absolutePath}\" tsx \"$localServerPath\"",
"pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/server/tsconfig.json\" \"$localServerPath\"",
)
} else {
ProcessBuilder()
.command(
"bash",
"-c",
"NODE_PATH='${sdkDir.absolutePath}/node_modules' npx --prefix '${sdkDir.absolutePath}' tsx \"$localServerPath\"",
"pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/server/tsconfig.json' \"$localServerPath\"",
)
}
processBuilder.environment()["TYPESCRIPT_SDK_DIR"] = sdkDir.absolutePath
val process = processBuilder
.directory(tsClientDir)
.directory(sdkDir)
.redirectErrorStream(false)
.start()
// For stdio transports, do NOT read from stdout (it's used for protocol). Read stderr for logs only.
Expand Down Expand Up @@ -378,8 +385,8 @@ abstract class OldSchemaTsTestBase {
"/c",
(
"set TYPESCRIPT_SDK_DIR=${sdkDir.absolutePath} && " +
"set NODE_PATH=${sdkDir.absolutePath}\\node_modules && " +
"npx --prefix \"${sdkDir.absolutePath}\" tsx \"$clientPath\" " +
"cd \"${sdkDir.absolutePath}\" && " +
"pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/client/tsconfig.json\" \"$clientPath\" " +
args.joinToString(" ")
),
)
Expand All @@ -393,8 +400,8 @@ abstract class OldSchemaTsTestBase {
"-c",
(
"TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' " +
"NODE_PATH='${sdkDir.absolutePath}/node_modules' " +
"npx --prefix '${sdkDir.absolutePath}' tsx \"$clientPath\" " +
"cd '${sdkDir.absolutePath}' && " +
"pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/client/tsconfig.json' \"$clientPath\" " +
args.joinToString(" ")
),
)
Expand Down
29 changes: 18 additions & 11 deletions ...rc/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/TsTestBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,15 @@ abstract class TsTestBase {
}
}

println("Installing TypeScript SDK dependencies")
executeCommand("npm install", sdkDir, allowFailure = false, timeoutSeconds = null)
println("Installing and build TypeScript SDK dependencies")
executeCommand(
"" +
"corepack enable && " +
"corepack install && " +
"pnpm install && " +
"pnpm build:all",
sdkDir, allowFailure = false, timeoutSeconds = null
)
}

@JvmStatic
Expand Down Expand Up @@ -247,21 +254,21 @@ abstract class TsTestBase {
.command(
"cmd.exe",
"/c",
"set MCP_PORT=$port && set NODE_PATH=${sdkDir.absolutePath}\\node_modules && npx --prefix \"${sdkDir.absolutePath}\" tsx \"$localServerPath\"",
"set MCP_PORT=$port && pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/server/tsconfig.json\" \"$localServerPath\"",
)
} else {
ProcessBuilder()
.command(
"bash",
"-c",
"MCP_PORT=$port NODE_PATH='${sdkDir.absolutePath}/node_modules' npx --prefix '${sdkDir.absolutePath}' tsx \"$localServerPath\"",
"MCP_PORT=$port && pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/server/tsconfig.json' \"$localServerPath\"",
)
}

processBuilder.environment()["TYPESCRIPT_SDK_DIR"] = sdkDir.absolutePath

val process = processBuilder
.directory(tsClientDir)
.directory(sdkDir)
.redirectErrorStream(true)
.start()

Expand Down Expand Up @@ -313,14 +320,14 @@ abstract class TsTestBase {
.command(
"cmd.exe",
"/c",
"set NODE_PATH=${sdkDir.absolutePath}\\node_modules && npx --prefix \"${sdkDir.absolutePath}\" tsx \"$localServerPath\"",
"cd \"${sdkDir.absolutePath}\" && pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/server/tsconfig.json\" \"$localServerPath\"",
)
} else {
ProcessBuilder()
.command(
"bash",
"-c",
"NODE_PATH='${sdkDir.absolutePath}/node_modules' npx --prefix '${sdkDir.absolutePath}' tsx \"$localServerPath\"",
"cd '${sdkDir.absolutePath}' && pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/server/tsconfig.json' \"$localServerPath\"",
)
}
processBuilder.environment()["TYPESCRIPT_SDK_DIR"] = sdkDir.absolutePath
Expand Down Expand Up @@ -377,8 +384,8 @@ abstract class TsTestBase {
"/c",
(
"set TYPESCRIPT_SDK_DIR=${sdkDir.absolutePath} && " +
"set NODE_PATH=${sdkDir.absolutePath}\\node_modules && " +
"npx --prefix \"${sdkDir.absolutePath}\" tsx \"$clientPath\" " +
"cd \"${sdkDir.absolutePath}\" && " +
"pnpm exec tsx --tsconfig \"${sdkDir.absolutePath}/packages/client/tsconfig.json\" \"$clientPath\" " +
args.joinToString(" ")
),
)
Expand All @@ -392,8 +399,8 @@ abstract class TsTestBase {
"-c",
(
"TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' " +
"NODE_PATH='${sdkDir.absolutePath}/node_modules' " +
"npx --prefix '${sdkDir.absolutePath}' tsx \"$clientPath\" " +
"cd '${sdkDir.absolutePath}' && " +
"pnpm exec tsx --tsconfig '${sdkDir.absolutePath}/packages/client/tsconfig.json' \"$clientPath\" " +
args.joinToString(" ")
),
)
Expand Down
8 changes: 6 additions & 2 deletions ...modelcontextprotocol/kotlin/sdk/integration/typescript/sse/TsClientKotlinServerTestSse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import io.modelcontextprotocol.kotlin.sdk.integration.typescript.AbstractTsClien
import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import java.io.File

class TsClientKotlinServerTestSse : AbstractTsClientKotlinServerTest() {

Expand Down Expand Up @@ -37,14 +38,17 @@ class TsClientKotlinServerTestSse : AbstractTsClientKotlinServerTest() {
override fun afterServer() {}

override fun runClient(vararg args: String): String {
val myClientPath = File(tsClientDir, "myClient.ts").absolutePath
val cmd = buildString {
append("npx tsx myClient.ts ")
append("pnpm exec tsx \"")
append(myClientPath)
append("\" ")
append(serverUrl)
if (args.isNotEmpty()) {
append(' ')
append(args.joinToString(" "))
}
}
return executeCommand(cmd, tsClientDir)
return executeCommand(cmd, sdkDir)
}
}
7 changes: 3 additions & 4 deletions .../jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/sse/myClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ async function main() {
const path = await import('path');
// @ts-ignore
const { pathToFileURL } = await import('url');
const clientUrl = pathToFileURL(path.join(sdkDir, 'src', 'client', 'index.ts')).href;
const streamUrl = pathToFileURL(path.join(sdkDir, 'src', 'client', 'streamableHttp.js')).href;
const clientUrl = pathToFileURL(path.join(sdkDir, 'packages', 'client', 'dist', 'index.mjs')).href;
// @ts-ignore
({ Client } = await import(clientUrl));
const clientModule = await import(clientUrl);
// @ts-ignore
({ StreamableHTTPClientTransport } = await import(streamUrl));
({ Client, StreamableHTTPClientTransport } = clientModule);
} else {
// @ts-ignore
({Client} = await import("../../../../../../../resources/typescript-sdk/src/client"));
Expand Down
20 changes: 9 additions & 11 deletions ...lin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/sse/simpleStreamableHttp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,17 @@ async function importFromSdk<T = any>(rel: string): Promise<T> {
}

async function main() {
const {McpServer} = await importFromSdk<any>('src/server/mcp.ts');
const {StreamableHTTPServerTransport} = await importFromSdk<any>('src/server/streamableHttp.ts');
const {McpServer} = await importFromSdk<any>('packages/server/src/index.ts');
const {StreamableHTTPServerTransport} = await importFromSdk<any>('packages/server/src/index.ts');
const {
getOAuthProtectedResourceMetadataUrl,
mcpAuthMetadataRouter
} = await importFromSdk<any>('src/server/auth/router.ts');
const {requireBearerAuth} = await importFromSdk<any>('src/server/auth/middleware/bearerAuth.ts');
const {
isInitializeRequest,
} = await importFromSdk<any>('src/types.ts');
const {InMemoryEventStore} = await importFromSdk<any>('src/examples/shared/inMemoryEventStore.ts');
const {setupAuthServer} = await importFromSdk<any>('src/examples/server/demoInMemoryOAuthProvider.ts');
const {checkResourceAllowed} = await importFromSdk<any>('src/shared/auth-utils.ts');
mcpAuthMetadataRouter,
checkResourceAllowed,
requireBearerAuth
} = await importFromSdk<any>('packages/server/src/index.ts');
const {InMemoryEventStore} = await importFromSdk<any>('examples/server/src/inMemoryEventStore.ts');
const {isInitializeRequest} = await importFromSdk<any>('packages/core/src/index.ts');
const {setupAuthServer} = await importFromSdk<any>('examples/shared/src/index.ts');

// Check for OAuth flag
const useOAuth = process.argv.includes('--oauth');
Expand Down
2 changes: 1 addition & 1 deletion ...vmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/stdio/myClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async function main() {

const path = await import('path');
const { pathToFileURL } = await import('url');
const clientUrl = pathToFileURL(path.join(sdkDir, 'src', 'client', 'index.ts')).href;
const clientUrl = pathToFileURL(path.join(sdkDir, 'packages', 'client', 'dist', 'index.mjs')).href;
({ Client } = await import(clientUrl));

if (!toolName) {
Expand Down
4 changes: 2 additions & 2 deletions ...est/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/stdio/simpleStdio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ async function importFromSdk(rel: string): Promise<any> {
}

async function main() {
const { McpServer } = await importFromSdk('src/server/mcp.ts');
const { StdioServerTransport } = await importFromSdk('src/server/stdio.ts');
const { McpServer } = await importFromSdk('packages/server/src/index.ts');
const { StdioServerTransport } = await importFromSdk('packages/server/src/index.ts');

const server = new McpServer({
name: 'simple-stdio-server',
Expand Down