* Preserve request id in JSON-RPC error responses instead of fabricating id:"" When the server received input it could not turn into a valid message, the error response carried a fabricated empty-string id that was never in the request, breaking JSON-RPC client correlation. The id default for the error factories was '' and that default reached the wire unchanged: unrecoverable parse errors emitted id:"", and for invalid- but-parseable messages MessageFactory discarded the decoded id so it also fell back to "". Now unrecoverable parse errors (-32700) return id: null per JSON-RPC 2.0, and invalid-but-parseable requests (-32600) preserve the original request id. Error::$id / getId() and the $id parameter of forParseError() / forInvalidRequest() are widened to string|int|null, and the recoverable id is threaded through InvalidInputMessageException. Fixes #333 * Preserve nullable request id consistently across Error factories and fromArray - Widen the remaining for*() factories (forMethodNotFound, forInvalidParams, forInternalError, forServerError, forResourceNotFound) to string|int|null defaulting to null, so no error path can fabricate id:"" again. The only defaulting call site (ProtocolVersionMiddleware) now emits id:null instead of id:"" for a pre-parse rejection, which is the spec-correct value. - Accept a null id in Error::fromArray(): require the id key to be present (JSON-RPC responses must carry it) but allow its value to be null, so a spec-compliant id:null error response round-trips and incoming error responses with id:null are accepted instead of rejected. - Widen the @phpstan-type ErrorData id to string|int|null to match the ctor, getId(), and jsonSerialize() shape. * Document intentional id recovery guard in MessageFactory * Cover id: 0 and string ids in recoverable-id preservation test * Fixed client handling of null-id error responses
229 lines
7.6 KiB
PHP
229 lines
7.6 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of the official PHP MCP SDK.
|
|
*
|
|
* A collaboration between Symfony and the PHP Foundation.
|
|
*
|
|
* For the full copyright and license information, please view the LICENSE
|
|
* file that was distributed with this source code.
|
|
*/
|
|
|
|
namespace Mcp\Tests\Unit\Client;
|
|
|
|
use Mcp\Client\Configuration;
|
|
use Mcp\Client\Protocol;
|
|
use Mcp\Client\State\ClientStateInterface;
|
|
use Mcp\Client\Transport\TransportInterface;
|
|
use Mcp\Exception\LogicException;
|
|
use Mcp\Schema\ClientCapabilities;
|
|
use Mcp\Schema\Enum\ProtocolVersion;
|
|
use Mcp\Schema\Implementation;
|
|
use Mcp\Schema\JsonRpc\Error;
|
|
use Mcp\Schema\JsonRpc\MessageInterface;
|
|
use Mcp\Schema\JsonRpc\Response;
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
use PHPUnit\Framework\Attributes\TestDox;
|
|
use PHPUnit\Framework\TestCase;
|
|
use Psr\Log\AbstractLogger;
|
|
use Psr\Log\LogLevel;
|
|
|
|
final class ProtocolTest extends TestCase
|
|
{
|
|
#[TestDox('offers the configured protocol version in the handshake')]
|
|
public function testOffersConfiguredVersion(): void
|
|
{
|
|
$transport = new RecordingTransport(ProtocolVersion::V2025_06_18->value);
|
|
$protocol = new Protocol();
|
|
$protocol->connect($transport, $config = $this->createConfiguration(ProtocolVersion::V2025_06_18));
|
|
|
|
$protocol->initialize($config);
|
|
|
|
$this->assertSame(ProtocolVersion::V2025_06_18->value, $transport->offeredVersion);
|
|
}
|
|
|
|
#[TestDox('never offers a modern version over the initialize handshake, and warns about it')]
|
|
public function testDoesNotOfferModernVersionOverHandshake(): void
|
|
{
|
|
$transport = new RecordingTransport(ProtocolVersion::latestHandshake()->value);
|
|
$protocol = new Protocol(logger: $logger = new CollectingLogger());
|
|
$protocol->connect($transport, $config = $this->createConfiguration(ProtocolVersion::V2026_07_28));
|
|
|
|
$protocol->initialize($config);
|
|
|
|
$this->assertSame(ProtocolVersion::latestHandshake()->value, $transport->offeredVersion);
|
|
$this->assertSame([[
|
|
'configured' => ProtocolVersion::V2026_07_28->value,
|
|
'offered' => ProtocolVersion::latestHandshake()->value,
|
|
]], $logger->warnings);
|
|
}
|
|
|
|
#[TestDox('accepts a counter-offer the SDK can speak and records it as negotiated')]
|
|
public function testAcceptsHandshakeCounterOffer(): void
|
|
{
|
|
$transport = new RecordingTransport(ProtocolVersion::V2024_11_05->value);
|
|
$protocol = new Protocol();
|
|
$protocol->connect($transport, $config = $this->createConfiguration(ProtocolVersion::V2025_11_25));
|
|
|
|
$result = $protocol->initialize($config);
|
|
|
|
$this->assertInstanceOf(Response::class, $result);
|
|
$this->assertSame(ProtocolVersion::V2024_11_05, $protocol->getState()->getProtocolVersion());
|
|
$this->assertTrue($protocol->getState()->isInitialized());
|
|
}
|
|
|
|
#[TestDox('fails the handshake when the server answers with a version the SDK cannot speak')]
|
|
#[DataProvider('provideUnusableCounterOffers')]
|
|
public function testRejectsUnusableCounterOffer(string $counterOffer): void
|
|
{
|
|
$transport = new RecordingTransport($counterOffer);
|
|
$protocol = new Protocol();
|
|
$protocol->connect($transport, $config = $this->createConfiguration(ProtocolVersion::V2025_11_25));
|
|
|
|
$result = $protocol->initialize($config);
|
|
|
|
$this->assertInstanceOf(Error::class, $result);
|
|
$this->assertStringContainsString($counterOffer, $result->message);
|
|
$this->assertNull($protocol->getState()->getProtocolVersion());
|
|
$this->assertFalse($protocol->getState()->isInitialized());
|
|
}
|
|
|
|
/**
|
|
* @return iterable<string, array{string}>
|
|
*/
|
|
public static function provideUnusableCounterOffers(): iterable
|
|
{
|
|
yield 'unknown revision' => ['2099-01-01'];
|
|
// The modern era has no `initialize`, so a server answering the handshake
|
|
// with one has produced a connection neither side can actually use.
|
|
yield 'modern revision' => [ProtocolVersion::V2026_07_28->value];
|
|
}
|
|
|
|
#[TestDox('logs and ignores an id-less error response instead of crashing on it')]
|
|
public function testIgnoresIdLessErrorResponse(): void
|
|
{
|
|
$protocol = new Protocol(logger: $logger = new CollectingLogger());
|
|
|
|
$protocol->processMessage(json_encode([
|
|
'jsonrpc' => MessageInterface::JSONRPC_VERSION,
|
|
'error' => ['code' => -32700, 'message' => 'Parse error'],
|
|
], \JSON_THROW_ON_ERROR));
|
|
|
|
$this->assertCount(1, $logger->warnings);
|
|
}
|
|
|
|
#[TestDox('stores an error response under its id so the pending request can be correlated')]
|
|
public function testErrorResponseWithIdIsStoredForItsPendingRequest(): void
|
|
{
|
|
$protocol = new Protocol();
|
|
|
|
$protocol->processMessage('{"jsonrpc": "2.0", "id": 7, "error": {"code": -32601, "message": "Method not found"}}');
|
|
|
|
$response = $protocol->getState()->consumeResponse(7);
|
|
|
|
$this->assertInstanceOf(Error::class, $response);
|
|
$this->assertSame(7, $response->getId());
|
|
$this->assertSame(Error::METHOD_NOT_FOUND, $response->code);
|
|
}
|
|
|
|
private function createConfiguration(ProtocolVersion $protocolVersion): Configuration
|
|
{
|
|
return new Configuration(
|
|
clientInfo: new Implementation('client-app', '1.0.0'),
|
|
capabilities: new ClientCapabilities(),
|
|
protocolVersion: $protocolVersion,
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Transport that answers the `initialize` request inline with a canned
|
|
* `protocolVersion`, so the handshake resolves without a Fiber round-trip.
|
|
*/
|
|
final class RecordingTransport implements TransportInterface
|
|
{
|
|
public ?string $offeredVersion = null;
|
|
|
|
private ClientStateInterface $state;
|
|
|
|
public function __construct(private readonly string $counterOffer)
|
|
{
|
|
}
|
|
|
|
public function send(string $data): void
|
|
{
|
|
/** @var array{id: int|string, method: string, params?: array{protocolVersion?: string}} $message */
|
|
$message = json_decode($data, true);
|
|
|
|
if ('initialize' !== ($message['method'] ?? null)) {
|
|
return;
|
|
}
|
|
|
|
$this->offeredVersion = $message['params']['protocolVersion'] ?? null;
|
|
|
|
$this->state->storeResponse($message['id'], [
|
|
'jsonrpc' => MessageInterface::JSONRPC_VERSION,
|
|
'id' => $message['id'],
|
|
'result' => [
|
|
'protocolVersion' => $this->counterOffer,
|
|
'capabilities' => [],
|
|
'serverInfo' => ['name' => 'server', 'version' => '1.2.3'],
|
|
],
|
|
]);
|
|
}
|
|
|
|
public function setState(ClientStateInterface $state): void
|
|
{
|
|
$this->state = $state;
|
|
}
|
|
|
|
public function connect(): void
|
|
{
|
|
}
|
|
|
|
public function close(): void
|
|
{
|
|
}
|
|
|
|
public function runRequest(\Fiber $fiber, ?callable $onProgress = null): Response|Error
|
|
{
|
|
throw new LogicException('Not used in these tests.');
|
|
}
|
|
|
|
public function onInitialize(callable $callback): void
|
|
{
|
|
}
|
|
|
|
public function onMessage(callable $callback): void
|
|
{
|
|
}
|
|
|
|
public function onError(callable $callback): void
|
|
{
|
|
}
|
|
|
|
public function onClose(callable $callback): void
|
|
{
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Logger that keeps the context of every warning, so a silent fallback can be
|
|
* told apart from one the caller was told about.
|
|
*/
|
|
final class CollectingLogger extends AbstractLogger
|
|
{
|
|
/** @var list<array<string, mixed>> */
|
|
public array $warnings = [];
|
|
|
|
/**
|
|
* @param string|\Stringable $message
|
|
* @param array<string, mixed> $context
|
|
*/
|
|
public function log($level, $message, array $context = []): void
|
|
{
|
|
if (LogLevel::WARNING === $level) {
|
|
$this->warnings[] = $context;
|
|
}
|
|
}
|
|
}
|