modelcontextprotocol/swift-sdk
Watch
1
0
Fork
You've already forked swift-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update transports to send and receive data instead of strings (#42)

Browse source 
* Update transports to send and receive data instead of strings

* Rename MockTransport helper methods

* Adopt Task.sleep(for:...) instead of variant taking nanoseconds

* Update comment

* Revert inadvertant change to visibility of send method
This commit is contained in:
Mattt 2025-04-03 04:42:56 -07:00 • committed by GitHub
commit a9bcbf9ad9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 138 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Sources/MCP/Client/Client.swift
View file

@ -181,15 +181,10 @@ public actor Client {
do {
let stream = await connection.receive()
for try await string in stream {
for try await data in stream {
if Task.isCancelled { break } // Check inside loop too
// Decode and handle incoming message
guard let data = string.data(using: .utf8) else {
throw Error.parseError("Invalid UTF-8 data")
}
// Attempt to decode string data as AnyResponse or AnyMessage
// Attempt to decode data as AnyResponse or AnyMessage
let decoder = JSONDecoder()
if let response = try? decoder.decode(AnyResponse.self, from: data),
let request = pendingRequests[response.id]
@ -207,7 +202,7 @@ public actor Client {
}
}
} catch let error where Error.isResourceTemporarilyUnavailable(error) {
try? await Task.sleep(nanoseconds: 10_000_000) // 10ms
try? await Task.sleep(for: .milliseconds(10))
continue
} catch {
await logger?.error(
@ -256,12 +251,9 @@ public actor Client {
}
let requestData = try JSONEncoder().encode(request)
guard let requestString = String(data: requestData, encoding: .utf8) else {
throw Error.internalError("Failed to encode request")
}
// Store the pending request first
return try await withCheckedThrowingContinuation { continuation in
// Store the pending request first
Task {
self.addPendingRequest(
id: request.id,
@ -269,9 +261,9 @@ public actor Client {
type: M.Result.self
)
// Send the request
// Send the request data
do {
try await connection.send(requestString)
try await connection.send(requestData)
} catch {
continuation.resume(throwing: error)
self.removePendingRequest(id: request.id)