Fix client parsing (#8)
* Allow decoding Decodable type directly from Value Summary: I noticed we are not converting value associated with response to the strong types requests recorded This change will help to decode the value type later once we support the rest of plumbing (next commit) * Store and pass original request when response arrives Summary: Looks like there were multiple issues with parsing response: 1. It appears that we would mistakenly pass response both for response and request arguments in the private func handleResponse(_ response: Response<AnyMethod>, for request: Any) 2. Later I couldn't figure out how to win against swift type system, so ended up creating a type-erased request to store in the pendingRequests instead of original type under Any (that wouldn't allow to downcast original type later) Test Plan: 1. Standup iMCP client from https://github.com/loopwork-ai/iMCP 2. Create a dummy project setting up MCP client against "/private/var/folders/26/8gncz37x7slbfrr95d9jcr400000gn/T/AppTranslocation/62ADEC4D-3545-4E98-A612-0E6DF52CE525/d/iMCP.app/Contents/MacOS/imcp-server" and call initialize Note response is being parsed correctly and client.initialize() does not hang indefinitely * Fix warning: 'Cast from Client.AnyPendingRequest to unrelated type Client.PendingRequest<Any> always fails' * Fix warning: 'Conditional cast from NWError to NWError always succeeds' * Uncomment code in RoundtripTests * Formatting * Reorganize declarations * Inline JSONDecoder extension * Expand roundtrip tests --------- Co-authored-by: Sash Zats sash@zats.io <> Co-authored-by: Mattt Zmuda <mattt@loopwork.com>
This commit is contained in:
parent
9ebe12559e
commit
c63a872a69
3 changed files with 122 additions and 45 deletions
|
|
@ -396,13 +396,7 @@ public actor StdioTransport: Transport {
|
||||||
if !receiveContinuationResumed {
|
if !receiveContinuationResumed {
|
||||||
receiveContinuationResumed = true
|
receiveContinuationResumed = true
|
||||||
if let error = error {
|
if let error = error {
|
||||||
if let nwError = error as? NWError {
|
continuation.resume(throwing: MCP.Error.transportError(error))
|
||||||
continuation.resume(throwing: MCP.Error.transportError(nwError))
|
|
||||||
} else {
|
|
||||||
continuation.resume(
|
|
||||||
throwing: MCP.Error.internalError("Receive error: \(error)")
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} else if let content = content {
|
} else if let content = content {
|
||||||
continuation.resume(returning: content)
|
continuation.resume(returning: content)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -87,12 +87,48 @@ public actor Client {
|
||||||
/// The task for the message handling loop
|
/// The task for the message handling loop
|
||||||
private var task: Task<Void, Never>?
|
private var task: Task<Void, Never>?
|
||||||
|
|
||||||
|
/// An error indicating a type mismatch when decoding a pending request
|
||||||
|
private struct TypeMismatchError: Swift.Error {}
|
||||||
|
|
||||||
/// A pending request with a continuation for the result
|
/// A pending request with a continuation for the result
|
||||||
private struct PendingRequest<T> {
|
private struct PendingRequest<T> {
|
||||||
let continuation: CheckedContinuation<T, Swift.Error>
|
let continuation: CheckedContinuation<T, Swift.Error>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A type-erased pending request
|
||||||
|
private struct AnyPendingRequest {
|
||||||
|
private let _resume: (Result<Any, Swift.Error>) -> Void
|
||||||
|
|
||||||
|
init<T: Sendable & Decodable>(_ request: PendingRequest<T>) {
|
||||||
|
_resume = { result in
|
||||||
|
switch result {
|
||||||
|
case .success(let value):
|
||||||
|
if let typedValue = value as? T {
|
||||||
|
request.continuation.resume(returning: typedValue)
|
||||||
|
} else if let value = value as? Value,
|
||||||
|
let data = try? JSONEncoder().encode(value),
|
||||||
|
let decoded = try? JSONDecoder().decode(T.self, from: data)
|
||||||
|
{
|
||||||
|
request.continuation.resume(returning: decoded)
|
||||||
|
} else {
|
||||||
|
request.continuation.resume(throwing: TypeMismatchError())
|
||||||
|
}
|
||||||
|
case .failure(let error):
|
||||||
|
request.continuation.resume(throwing: error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func resume(returning value: Any) {
|
||||||
|
_resume(.success(value))
|
||||||
|
}
|
||||||
|
|
||||||
|
func resume(throwing error: Swift.Error) {
|
||||||
|
_resume(.failure(error))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// A dictionary of type-erased pending requests, keyed by request ID
|
/// A dictionary of type-erased pending requests, keyed by request ID
|
||||||
private var pendingRequests: [ID: Any] = [:]
|
private var pendingRequests: [ID: AnyPendingRequest] = [:]
|
||||||
|
|
||||||
public init(
|
public init(
|
||||||
name: String,
|
name: String,
|
||||||
|
|
@ -129,8 +165,10 @@ public actor Client {
|
||||||
|
|
||||||
// Attempt to decode string data as AnyResponse or AnyMessage
|
// Attempt to decode string data as AnyResponse or AnyMessage
|
||||||
let decoder = JSONDecoder()
|
let decoder = JSONDecoder()
|
||||||
if let response = try? decoder.decode(AnyResponse.self, from: data) {
|
if let response = try? decoder.decode(AnyResponse.self, from: data),
|
||||||
await handleResponse(response, for: response)
|
let request = pendingRequests[response.id]
|
||||||
|
{
|
||||||
|
await handleResponse(response, for: request)
|
||||||
} else if let message = try? decoder.decode(AnyMessage.self, from: data) {
|
} else if let message = try? decoder.decode(AnyMessage.self, from: data) {
|
||||||
await handleMessage(message)
|
await handleMessage(message)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -158,11 +196,7 @@ public actor Client {
|
||||||
public func disconnect() async {
|
public func disconnect() async {
|
||||||
// Cancel all pending requests
|
// Cancel all pending requests
|
||||||
for (id, request) in pendingRequests {
|
for (id, request) in pendingRequests {
|
||||||
// We know this cast is safe because we only store PendingRequest values
|
request.resume(throwing: Error.internalError("Client disconnected"))
|
||||||
if let typedRequest = request as? PendingRequest<Any> {
|
|
||||||
typedRequest.continuation.resume(
|
|
||||||
throwing: Error.internalError("Client disconnected"))
|
|
||||||
}
|
|
||||||
pendingRequests.removeValue(forKey: id)
|
pendingRequests.removeValue(forKey: id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -220,12 +254,12 @@ public actor Client {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func addPendingRequest<T>(
|
private func addPendingRequest<T: Sendable & Decodable>(
|
||||||
id: ID,
|
id: ID,
|
||||||
continuation: CheckedContinuation<T, Swift.Error>,
|
continuation: CheckedContinuation<T, Swift.Error>,
|
||||||
type: T.Type
|
type: T.Type
|
||||||
) {
|
) {
|
||||||
pendingRequests[id] = PendingRequest(continuation: continuation)
|
pendingRequests[id] = AnyPendingRequest(PendingRequest(continuation: continuation))
|
||||||
}
|
}
|
||||||
|
|
||||||
private func removePendingRequest(id: ID) {
|
private func removePendingRequest(id: ID) {
|
||||||
|
|
@ -320,19 +354,18 @@ public actor Client {
|
||||||
|
|
||||||
// MARK: -
|
// MARK: -
|
||||||
|
|
||||||
private func handleResponse(_ response: Response<AnyMethod>, for request: Any) async {
|
private func handleResponse(_ response: Response<AnyMethod>, for request: AnyPendingRequest)
|
||||||
|
async
|
||||||
|
{
|
||||||
await logger?.debug(
|
await logger?.debug(
|
||||||
"Processing response",
|
"Processing response",
|
||||||
metadata: ["id": "\(response.id)"])
|
metadata: ["id": "\(response.id)"])
|
||||||
|
|
||||||
// We know this cast is safe because we only store PendingRequest values
|
|
||||||
guard let typedRequest = request as? PendingRequest<Any> else { return }
|
|
||||||
|
|
||||||
switch response.result {
|
switch response.result {
|
||||||
case .success(let value):
|
case .success(let value):
|
||||||
typedRequest.continuation.resume(returning: value)
|
request.resume(returning: value)
|
||||||
case .failure(let error):
|
case .failure(let error):
|
||||||
typedRequest.continuation.resume(throwing: error)
|
request.resume(throwing: error)
|
||||||
}
|
}
|
||||||
|
|
||||||
removePendingRequest(id: response.id)
|
removePendingRequest(id: response.id)
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,9 @@ import Testing
|
||||||
@Suite("Roundtrip Tests")
|
@Suite("Roundtrip Tests")
|
||||||
struct RoundtripTests {
|
struct RoundtripTests {
|
||||||
@Test(
|
@Test(
|
||||||
"Initialize roundtrip",
|
|
||||||
.timeLimit(.minutes(1))
|
.timeLimit(.minutes(1))
|
||||||
)
|
)
|
||||||
func testInitializeRoundtrip() async throws {
|
func testRoundtrip() async throws {
|
||||||
let (clientToServerRead, clientToServerWrite) = try FileDescriptor.pipe()
|
let (clientToServerRead, clientToServerWrite) = try FileDescriptor.pipe()
|
||||||
let (serverToClientRead, serverToClientWrite) = try FileDescriptor.pipe()
|
let (serverToClientRead, serverToClientWrite) = try FileDescriptor.pipe()
|
||||||
|
|
||||||
|
|
@ -36,32 +35,83 @@ struct RoundtripTests {
|
||||||
version: "1.0.0",
|
version: "1.0.0",
|
||||||
capabilities: .init(prompts: .init(), tools: .init())
|
capabilities: .init(prompts: .init(), tools: .init())
|
||||||
)
|
)
|
||||||
|
await server.withMethodHandler(ListTools.self) { _ in
|
||||||
|
return ListTools.Result(tools: [
|
||||||
|
Tool(
|
||||||
|
name: "add",
|
||||||
|
description: "Adds two numbers together",
|
||||||
|
inputSchema: [
|
||||||
|
"a": ["type": "integer", "description": "The first number"],
|
||||||
|
"a": ["type": "integer", "description": "The second number"],
|
||||||
|
])
|
||||||
|
])
|
||||||
|
}
|
||||||
|
await server.withMethodHandler(CallTool.self) { request in
|
||||||
|
guard request.name == "add" else {
|
||||||
|
return CallTool.Result(content: [.text("Invalid tool name")], isError: true)
|
||||||
|
}
|
||||||
|
|
||||||
|
guard let a = request.arguments?["a"]?.intValue,
|
||||||
|
let b = request.arguments?["b"]?.intValue
|
||||||
|
else {
|
||||||
|
return CallTool.Result(
|
||||||
|
content: [.text("Did not receive valid arguments")], isError: true)
|
||||||
|
}
|
||||||
|
|
||||||
|
return CallTool.Result(content: [.text("\(a + b)")], isError: false)
|
||||||
|
}
|
||||||
|
|
||||||
let client = Client(name: "TestClient", version: "1.0")
|
let client = Client(name: "TestClient", version: "1.0")
|
||||||
|
|
||||||
try await server.start(transport: serverTransport)
|
try await server.start(transport: serverTransport)
|
||||||
try await client.connect(transport: clientTransport)
|
try await client.connect(transport: clientTransport)
|
||||||
|
|
||||||
// let initTask = Task {
|
let initTask = Task {
|
||||||
// let result = try await client.initialize()
|
let result = try await client.initialize()
|
||||||
|
|
||||||
// #expect(result.serverInfo.name == "TestServer")
|
#expect(result.serverInfo.name == "TestServer")
|
||||||
// #expect(result.serverInfo.version == "1.0.0")
|
#expect(result.serverInfo.version == "1.0.0")
|
||||||
// #expect(result.capabilities.prompts != nil)
|
#expect(result.capabilities.prompts != nil)
|
||||||
// #expect(result.capabilities.tools != nil)
|
#expect(result.capabilities.tools != nil)
|
||||||
// #expect(result.protocolVersion == Version.latest)
|
#expect(result.protocolVersion == Version.latest)
|
||||||
// }
|
}
|
||||||
// try await withThrowingTaskGroup(of: Void.self) { group in
|
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||||
// group.addTask {
|
group.addTask {
|
||||||
// try await Task.sleep(for: .seconds(1))
|
try await Task.sleep(for: .seconds(1))
|
||||||
// initTask.cancel()
|
initTask.cancel()
|
||||||
// throw CancellationError()
|
throw CancellationError()
|
||||||
// }
|
}
|
||||||
// group.addTask {
|
group.addTask {
|
||||||
// try await initTask.value
|
try await initTask.value
|
||||||
// }
|
}
|
||||||
// try await group.next()
|
try await group.next()
|
||||||
// group.cancelAll()
|
group.cancelAll()
|
||||||
// }
|
}
|
||||||
|
|
||||||
|
let listToolsTask = Task {
|
||||||
|
let result = try await client.listTools()
|
||||||
|
#expect(result.count == 1)
|
||||||
|
#expect(result[0].name == "add")
|
||||||
|
}
|
||||||
|
|
||||||
|
let callToolTask = Task {
|
||||||
|
let result = try await client.callTool(name: "add", arguments: ["a": 1, "b": 2])
|
||||||
|
#expect(result.isError == false)
|
||||||
|
#expect(result.content == [.text("3")])
|
||||||
|
}
|
||||||
|
|
||||||
|
try await withThrowingTaskGroup(of: Void.self) { group in
|
||||||
|
group.addTask {
|
||||||
|
try await Task.sleep(for: .seconds(1))
|
||||||
|
listToolsTask.cancel()
|
||||||
|
throw CancellationError()
|
||||||
|
}
|
||||||
|
group.addTask {
|
||||||
|
try await callToolTask.value
|
||||||
|
}
|
||||||
|
try await group.next()
|
||||||
|
group.cancelAll()
|
||||||
|
}
|
||||||
|
|
||||||
await server.stop()
|
await server.stop()
|
||||||
await client.disconnect()
|
await client.disconnect()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue