Merge pull request #1 from trandbert37/feature/use-symfony-router

Use Symfony Router to generate endpoint

Author: trandbert37

src/Resources/config/services.xml

@@ -36,7 +36,7 @@
         </service>
 
         <service id="klp_mcp_server.transport.sse" class="KLP\KlpMcpServer\Transports\SseTransport">
-            <argument type="string">%klp_mcp_server.default_path%</argument>
+            <argument type="service" id="router" />
             <argument type="service" id="klp_mcp_server.adapter" on-invalid="null" />
             <argument type="service" id="logger" on-invalid="null" />
             <argument type="binary">%klp_mcp_server.ping.enabled%</argument>

src/Transports/SseTransport.php

@@ -6,6 +6,7 @@
 use KLP\KlpMcpServer\Transports\SseAdapters\SseAdapterException;
 use KLP\KlpMcpServer\Transports\SseAdapters\SseAdapterInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * SSE (Server-Sent Events) Transport implementation.
@@ -58,15 +59,15 @@ final class SseTransport implements SseTransportInterface
     /**
      * Initializes the class with the default path, adapter, logger, and ping settings.
      *
-     * @param  string  $defaultPath  The default path for resources.
+     * @param RouterInterface $router The router instance (optional).
      * @param  SseAdapterInterface|null  $adapter  Optional adapter for message persistence and retrieval (e.g., Redis).
      *                                             Enables simulation of request/response patterns over SSE.
      * @param  LoggerInterface|null  $logger  The logger instance (optional).
      * @param  bool  $pingEnabled  Flag to enable or disable ping functionality.
      * @param  int  $pingInterval  The interval, in secondes, at which ping messages are sent to maintain the connection.
      */
     public function __construct(
-        private readonly string $defaultPath,
+        private readonly RouterInterface $router,
         private ?SseAdapterInterface $adapter = null,
         private readonly ?LoggerInterface $logger = null,
         private bool $pingEnabled = false,
@@ -330,10 +331,7 @@ public function pushMessage(string $clientId, array $message): void
 
     private function getEndpoint(string $sessionId): string
     {
-        return sprintf('/%s/messages?sessionId=%s',
-            trim($this->defaultPath, '/'),
-            $sessionId,
-        );
+        return $this->router->generate('message_route', ['sessionId' => $sessionId]);
     }
 
     /**

tests/Transports/SseTransportTest.php

@@ -10,6 +10,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 #[Small]
 class SseTransportTest extends TestCase
@@ -18,14 +19,17 @@ class SseTransportTest extends TestCase
 
     private SseAdapterInterface|MockObject $adapterMock;
 
+    private RouterInterface|MockObject $routerMock;
+
     private SseTransport $instance;
 
     protected function setUp(): void
     {
         parent::setUp();
         $this->loggerMock = $this->createMock(LoggerInterface::class);
         $this->adapterMock = $this->createMock(SseAdapterInterface::class);
-        $this->instance = new SseTransport('/default-path', $this->adapterMock, $this->loggerMock);
+        $this->routerMock = $this->createMock(RouterInterface::class);
+        $this->instance = new SseTransport($this->routerMock, $this->adapterMock, $this->loggerMock);
     }
 
     /**
@@ -58,6 +62,17 @@ public function test_send_string_message(): void
      */
     public function test_initialize_generates_client_id_and_sends_endpoint(): void
     {
+        // Arrange
+        $this->routerMock
+            ->expects($this->once())
+            ->method('generate')
+            ->willReturnCallback(function (string $name, array $parameters = []): string {
+                $this->assertEquals('message_route', $name);
+                $this->assertArrayHasKey('sessionId', $parameters);
+
+                return '/default-path/messages?sessionId='.$parameters['sessionId'];
+            })
+        ;
         // Act
         ob_start();
         try {
@@ -84,6 +99,11 @@ public function test_initialize_does_not_overwrite_existing_client_id(): void
         // Arrange
         $existingClientId = 'predefined-client-id';
         $this->setProtectedProperty($this->instance, 'clientId', $existingClientId);
+        $this->routerMock
+            ->expects($this->once())
+            ->method('generate')
+            ->with('message_route', ['sessionId' => $existingClientId])
+            ->willReturn('/default-path/messages?sessionId=' . $existingClientId);
 
         // Act
         ob_start();