V0.11.x (#199)
* Support 2025-06-18 Spec (#167) * Support OpenAI _meta for Tool * Update init * Add title and outputSchema * Concurreny issue * General fields * Add Generate Fields to Server elements * 4 tab spacing * Update Version * Elicitation * Format * More tests and inits * Elicitation in README * Fix orphaned test * Add title to more structs * Public init * Fix meta validation and make tests more generic * Format and make Result properties public again * Revert more visibility changes * feat: 2025-11-25 phase 1, includes Version, Icon, Progress (#181) * chore: fixed unit tests * feat: added icon and progess base structs * feat: added progress notification and meta to callTool * feat: added tests * feat: simplified RequestMeta encoding/decoding * tests: added unit test to track progress * chore: rebased v0.11.x * feat: implemented cancellation * feat: added overloaded callTool method * fix: encoding Response _meta fix * chore: added old version to the versions list * feat: 2025-11-25 phase 2; added Logging and Completions (#196) * feat: added Logging and Completions * feat: updated EmbeddedResource for the latest spec * chore: changed encoding of meta in Prompts to encodeIfPresent * feat: compliance tests + http server transport (#197) * feat: http server transport * feat: added http server transport * feat: removed unused files * feat: added conformance tests * feat: improved conformace testing * chore: removed redundant files * feat/2025-11-25: sampling, elicitation, roots (#198) * feat: Roots implementation * feat: added unit testing * feat: improved unit tests and fixed NetworkTransport crash * feat: implemented sampling and elicitation * feat: improved sampling tests * feat: improved elicitation tests * feat: improved confirmance tests * feat: improved Prompts unit tests * feat: removed test code * feat: updated conformance tests * chore: removed redundant commas * chore: removed 6.0.3 swift version from ci * chore: improved unit tests a little bit * chore: update README.md * chore: add server progress tracking example to README.md * chore: updated README.md * chore: updated transports table formatting * chore: updated MockNetworkConnection --------- Co-authored-by: Austin Evans <austinjevans@me.com> Co-authored-by: yehorsobko <yehorsobko@macpaw.com>
This commit is contained in:
parent
6fa1a97b41
commit
6112a3995a
1 changed files with 11854 additions and 828 deletions
|
|
@ -39,7 +39,7 @@ struct ServerTests {
|
|||
try await server.start(transport: transport)
|
||||
|
||||
// Wait for message processing and response
|
||||
try await Task.sleep(for: .milliseconds(100))
|
||||
try await Task.sleep(for: .milliseconds(200))
|
||||
|
||||
#expect(await transport.sentMessages.count == 1)
|
||||
|
||||
|
|
@ -143,29 +143,45 @@ struct ServerTests {
|
|||
|
||||
@Test("JSON-RPC batch processing")
|
||||
func testJSONRPCBatchProcessing() async throws {
|
||||
let transport = MockTransport()
|
||||
let (clientTransport, serverTransport) = await InMemoryTransport.createConnectedPair()
|
||||
let server = Server(name: "TestServer", version: "1.0")
|
||||
|
||||
// Connect transports
|
||||
try await clientTransport.connect()
|
||||
try await serverTransport.connect()
|
||||
|
||||
// Start receiving messages on client side
|
||||
let receiveTask = Task {
|
||||
var responses: [String] = []
|
||||
for try await data in await clientTransport.receive() {
|
||||
if let response = String(data: data, encoding: .utf8) {
|
||||
responses.append(response)
|
||||
}
|
||||
// Stop after receiving 2 responses (initialize + batch)
|
||||
if responses.count == 2 {
|
||||
break
|
||||
}
|
||||
}
|
||||
return responses
|
||||
}
|
||||
|
||||
// Start the server
|
||||
try await server.start(transport: transport)
|
||||
try await server.start(transport: serverTransport)
|
||||
|
||||
// Initialize the server first
|
||||
try await transport.queue(
|
||||
request: Initialize.request(
|
||||
.init(
|
||||
protocolVersion: Version.latest,
|
||||
capabilities: .init(),
|
||||
clientInfo: .init(name: "TestClient", version: "1.0")
|
||||
)
|
||||
let initRequest = Initialize.request(
|
||||
.init(
|
||||
protocolVersion: Version.latest,
|
||||
capabilities: .init(),
|
||||
clientInfo: .init(name: "TestClient", version: "1.0")
|
||||
)
|
||||
)
|
||||
let initData = try JSONEncoder().encode(AnyRequest(initRequest))
|
||||
try await clientTransport.send(initData)
|
||||
|
||||
// Wait for server to initialize and respond
|
||||
// Wait for initialization
|
||||
try await Task.sleep(for: .milliseconds(100))
|
||||
|
||||
// Clear sent messages
|
||||
await transport.clearMessages()
|
||||
|
||||
// Create a batch with multiple requests
|
||||
let batchJSON = """
|
||||
[
|
||||
|
|
@ -173,19 +189,20 @@ struct ServerTests {
|
|||
{"jsonrpc":"2.0","id":2,"method":"ping","params":{}}
|
||||
]
|
||||
"""
|
||||
let batch = try JSONDecoder().decode([AnyRequest].self, from: batchJSON.data(using: .utf8)!)
|
||||
|
||||
// Send the batch request
|
||||
try await transport.queue(batch: batch)
|
||||
let batchData = batchJSON.data(using: .utf8)!
|
||||
try await clientTransport.send(batchData)
|
||||
|
||||
// Wait for batch processing
|
||||
try await Task.sleep(for: .milliseconds(100))
|
||||
try await Task.sleep(for: .milliseconds(200))
|
||||
|
||||
// Verify response
|
||||
let sentMessages = await transport.sentMessages
|
||||
#expect(sentMessages.count == 1)
|
||||
// Get responses
|
||||
let responses = try await receiveTask.value
|
||||
#expect(responses.count == 2)
|
||||
|
||||
// Verify the batch response (second response)
|
||||
if responses.count >= 2 {
|
||||
let batchResponse = responses[1]
|
||||
|
||||
if let batchResponse = sentMessages.first {
|
||||
// Should be an array
|
||||
#expect(batchResponse.hasPrefix("["))
|
||||
#expect(batchResponse.hasSuffix("]"))
|
||||
|
|
@ -196,6 +213,7 @@ struct ServerTests {
|
|||
}
|
||||
|
||||
await server.stop()
|
||||
await transport.disconnect()
|
||||
await clientTransport.disconnect()
|
||||
await serverTransport.disconnect()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue