Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Sources/MCP/Base/Transports/NetworkTransport.swift
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,9 @@ import Logging
if !isStopping {
// Release the underlying socket and finish the stream so
// receive() callers don't hang.
isConnected = false
heartbeatTask?.cancel()
heartbeatTask = nil
connection.cancel()
messageContinuation.finish(throwing: MCPError.connectionClosed)
}
Expand Down
28 changes: 28 additions & 0 deletions Tests/MCPTests/NetworkTransportTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,34 @@ import Testing
await transport.disconnect()
}

@Test("Heartbeats stop when empty reads reveal a failed connection")
func testHeartbeatsStopAfterEmptyReadFailure() async throws {
let mockConnection = MockNetworkConnection()
let transport = NetworkTransport(
mockConnection,
heartbeatConfig: .init(enabled: true, interval: 0.1)
)

try await transport.connect()
mockConnection.simulateFailure()

let deadline = ContinuousClock.now + .seconds(3)
while mockConnection.state != .cancelled && ContinuousClock.now < deadline {
try await Task.sleep(for: .milliseconds(50))
}
#expect(mockConnection.state == .cancelled)

await #expect(throws: MCPError.self) {
try await transport.send(Data())
}

let heartbeatsSent = mockConnection.getSentData().count
try await Task.sleep(for: .seconds(2.5))
#expect(mockConnection.getSentData().count == heartbeatsSent)

await transport.disconnect()
}

@Test("Resource Cleanup")
func testResourceCleanup() async throws {
weak var weakConnection: MockNetworkConnection?
Expand Down
Loading