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

chore(http): create constant for session id header (#246)

Browse source
This commit is contained in:
Edouard Courty 2026-02-23 22:42:54 +01:00 • committed by GitHub
commit 1f5f7e16a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Server/Transport/StreamableHttpTransport.php
View file

@ -30,6 +30,17 @@ use Symfony\Component\Uid\Uuid;
*/ */
class StreamableHttpTransport extends BaseTransport class StreamableHttpTransport extends BaseTransport
{ {
private const SESSION_HEADER = 'Mcp-Session-Id';
private const ALLOWED_HEADER = [
'Accept',
'Authorization',
'Content-Type',
'Last-Event-ID',
'Mcp-Protocol-Version',
self::SESSION_HEADER,
];
private ResponseFactoryInterface $responseFactory; private ResponseFactoryInterface $responseFactory;
private StreamFactoryInterface $streamFactory; private StreamFactoryInterface $streamFactory;
@ -62,8 +73,8 @@ class StreamableHttpTransport extends BaseTransport
$this->corsHeaders = array_merge([ $this->corsHeaders = array_merge([
'Access-Control-Allow-Origin' => '*', 'Access-Control-Allow-Origin' => '*',
'Access-Control-Allow-Methods' => 'GET, POST, DELETE, OPTIONS', 'Access-Control-Allow-Methods' => 'GET, POST, DELETE, OPTIONS',
'Access-Control-Allow-Headers' => 'Content-Type, Mcp-Session-Id, Mcp-Protocol-Version, Last-Event-ID, Authorization, Accept', 'Access-Control-Allow-Headers' => implode(',', self::ALLOWED_HEADER),
'Access-Control-Expose-Headers' => 'Mcp-Session-Id', 'Access-Control-Expose-Headers' => self::SESSION_HEADER,
], $corsHeaders); ], $corsHeaders);
foreach ($middleware as $m) { foreach ($middleware as $m) {
@ -120,7 +131,7 @@ class StreamableHttpTransport extends BaseTransport
protected function handleDeleteRequest(): ResponseInterface protected function handleDeleteRequest(): ResponseInterface
{ {
if (!$this->sessionId) { if (!$this->sessionId) {
return $this->createErrorResponse(Error::forInvalidRequest('Mcp-Session-Id header is required.'), 400); return $this->createErrorResponse(Error::forInvalidRequest(self::SESSION_HEADER.' header is required.'), 400);
} }
$this->handleSessionEnd($this->sessionId); $this->handleSessionEnd($this->sessionId);
@ -144,7 +155,7 @@ class StreamableHttpTransport extends BaseTransport
->withBody($this->streamFactory->createStream($responseBody)); ->withBody($this->streamFactory->createStream($responseBody));
if ($this->sessionId) { if ($this->sessionId) {
$response = $response->withHeader('Mcp-Session-Id', $this->sessionId->toRfc4122()); $response = $response->withHeader(self::SESSION_HEADER, $this->sessionId->toRfc4122());
} }
return $response; return $response;
@ -211,7 +222,7 @@ class StreamableHttpTransport extends BaseTransport
->withBody($stream); ->withBody($stream);
if ($this->sessionId) { if ($this->sessionId) {
$response = $response->withHeader('Mcp-Session-Id', $this->sessionId->toRfc4122()); $response = $response->withHeader(self::SESSION_HEADER, $this->sessionId->toRfc4122());
} }
return $response; return $response;
@ -276,7 +287,7 @@ class StreamableHttpTransport extends BaseTransport
private function handleRequest(ServerRequestInterface $request): ResponseInterface private function handleRequest(ServerRequestInterface $request): ResponseInterface
{ {
$this->request = $request; $this->request = $request;
$sessionIdString = $request->getHeaderLine('Mcp-Session-Id'); $sessionIdString = $request->getHeaderLine(self::SESSION_HEADER);
$this->sessionId = $sessionIdString ? Uuid::fromString($sessionIdString) : null; $this->sessionId = $sessionIdString ? Uuid::fromString($sessionIdString) : null;
return match ($request->getMethod()) { return match ($request->getMethod()) {

4
tests/Unit/Server/Transport/StreamableHttpTransportTest.php
View file

@ -80,7 +80,7 @@ final class StreamableHttpTransportTest extends TestCase
$this->assertSame('*', $response->getHeaderLine('Access-Control-Allow-Origin')); $this->assertSame('*', $response->getHeaderLine('Access-Control-Allow-Origin'));
$this->assertSame('GET, POST, DELETE, OPTIONS', $response->getHeaderLine('Access-Control-Allow-Methods')); $this->assertSame('GET, POST, DELETE, OPTIONS', $response->getHeaderLine('Access-Control-Allow-Methods'));
$this->assertSame( $this->assertSame(
'Content-Type, Mcp-Session-Id, Mcp-Protocol-Version, Last-Event-ID, Authorization, Accept', 'Accept,Authorization,Content-Type,Last-Event-ID,Mcp-Protocol-Version,Mcp-Session-Id',
$response->getHeaderLine('Access-Control-Allow-Headers') $response->getHeaderLine('Access-Control-Allow-Headers')
); );
$this->assertSame('Mcp-Session-Id', $response->getHeaderLine('Access-Control-Expose-Headers')); $this->assertSame('Mcp-Session-Id', $response->getHeaderLine('Access-Control-Expose-Headers'));
@ -120,7 +120,7 @@ final class StreamableHttpTransportTest extends TestCase
$this->assertSame('https://another.com', $response->getHeaderLine('Access-Control-Allow-Origin')); $this->assertSame('https://another.com', $response->getHeaderLine('Access-Control-Allow-Origin'));
$this->assertSame('GET, POST, DELETE, OPTIONS', $response->getHeaderLine('Access-Control-Allow-Methods')); $this->assertSame('GET, POST, DELETE, OPTIONS', $response->getHeaderLine('Access-Control-Allow-Methods'));
$this->assertSame( $this->assertSame(
'Content-Type, Mcp-Session-Id, Mcp-Protocol-Version, Last-Event-ID, Authorization, Accept', 'Accept,Authorization,Content-Type,Last-Event-ID,Mcp-Protocol-Version,Mcp-Session-Id',
$response->getHeaderLine('Access-Control-Allow-Headers') $response->getHeaderLine('Access-Control-Allow-Headers')
); );
$this->assertSame('Mcp-Session-Id', $response->getHeaderLine('Access-Control-Expose-Headers')); $this->assertSame('Mcp-Session-Id', $response->getHeaderLine('Access-Control-Expose-Headers'));