refactor: rename connectAndInitialize to connect for consistency

Author: CodeWithKyrian

src/Client.php

@@ -82,7 +82,7 @@ public function connect(TransportInterface $transport): void
         $this->transport = $transport;
         $this->protocol->connect($transport, $this->config);
 
-        $transport->connectAndInitialize();
+        $transport->connect();
 
         $this->logger->info('Client connected and initialized');
     }

src/Client/Builder.php

@@ -25,7 +25,7 @@
  *
  * @author Kyrian Obikwelu <koshnawaza@gmail.com>
  */
-class Builder
+final class Builder
 {
     private string $name = 'mcp-php-client';
     private string $version = '1.0.0';

src/Client/State/ClientState.php

@@ -31,10 +31,10 @@ class ClientState implements ClientStateInterface
     private ?Implementation $serverInfo = null;
     private ?string $instructions = null;
 
-    /** @var array<int, array{request_id: int, timestamp: int, timeout: int}> */
+    /** @var array<int|string, array{request_id: int|string, timestamp: int, timeout: int}> */
     private array $pendingRequests = [];
 
-    /** @var array<int, array<string, mixed>> */
+    /** @var array<int|string, array<string, mixed>> */
     private array $responses = [];
 
     /** @var array<int, array{token: string, progress: float, total: ?float, message: ?string}> */
@@ -45,7 +45,7 @@ public function nextRequestId(): int
         return $this->requestIdCounter++;
     }
 
-    public function addPendingRequest(int $requestId, int $timeout): void
+    public function addPendingRequest(int|string $requestId, int $timeout): void
     {
         $this->pendingRequests[$requestId] = [
             'request_id' => $requestId,
@@ -54,7 +54,7 @@ public function addPendingRequest(int $requestId, int $timeout): void
         ];
     }
 
-    public function removePendingRequest(int $requestId): void
+    public function removePendingRequest(int|string $requestId): void
     {
         unset($this->pendingRequests[$requestId]);
     }
@@ -64,12 +64,12 @@ public function getPendingRequests(): array
         return $this->pendingRequests;
     }
 
-    public function storeResponse(int $requestId, array $responseData): void
+    public function storeResponse(int|string $requestId, array $responseData): void
     {
         $this->responses[$requestId] = $responseData;
     }
 
-    public function consumeResponse(int $requestId): Response|Error|null
+    public function consumeResponse(int|string $requestId): Response|Error|null
     {
         if (!isset($this->responses[$requestId])) {
             return null;

src/Client/State/ClientStateInterface.php

@@ -34,37 +34,37 @@ public function nextRequestId(): int;
     /**
      * Add a pending request to track.
      *
-     * @param int $requestId The request ID
-     * @param int $timeout   Timeout in seconds
+     * @param int|string $requestId The request ID
+     * @param int        $timeout   Timeout in seconds
      */
-    public function addPendingRequest(int $requestId, int $timeout): void;
+    public function addPendingRequest(int|string $requestId, int $timeout): void;
 
     /**
      * Remove a pending request.
      */
-    public function removePendingRequest(int $requestId): void;
+    public function removePendingRequest(int|string $requestId): void;
 
     /**
      * Get all pending requests.
      *
-     * @return array<int, array{request_id: int, timestamp: int, timeout: int}>
+     * @return array<int|string, array{request_id: int|string, timestamp: int, timeout: int}>
      */
     public function getPendingRequests(): array;
 
     /**
      * Store a received response.
      *
-     * @param int                  $requestId    The request ID
+     * @param int|string           $requestId    The request ID
      * @param array<string, mixed> $responseData The raw response data
      */
-    public function storeResponse(int $requestId, array $responseData): void;
+    public function storeResponse(int|string $requestId, array $responseData): void;
 
     /**
      * Check and consume a response for a request ID.
      *
      * @return Response<array<string, mixed>>|Error|null
      */
-    public function consumeResponse(int $requestId): Response|Error|null;
+    public function consumeResponse(int|string $requestId): Response|Error|null;
 
     /**
      * Set initialization state.

src/Client/Transport/BaseTransport.php

@@ -12,6 +12,7 @@
 namespace Mcp\Client\Transport;
 
 use Mcp\Client\State\ClientStateInterface;
+use Mcp\Exception\RuntimeException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
@@ -74,12 +75,12 @@ public function setState(ClientStateInterface $state): void
      *
      * @return mixed The result from the initialization callback
      *
-     * @throws \RuntimeException If no initialize listener is registered
+     * @throws RuntimeException If no initialize listener is registered
      */
     protected function handleInitialize(): mixed
     {
         if (!\is_callable($this->initializeCallback)) {
-            throw new \RuntimeException('No initialize listener registered');
+            throw new RuntimeException('No initialize listener registered');
         }
 
         return ($this->initializeCallback)();

src/Client/Transport/HttpTransport.php

@@ -73,7 +73,7 @@ public function __construct(
         $this->streamFactory = $streamFactory ?? Psr17FactoryDiscovery::findStreamFactory();
     }
 
-    public function connectAndInitialize(): void
+    public function connect(): void
     {
         $this->activeFiber = new \Fiber(fn () => $this->handleInitialize());
 

src/Client/Transport/StdioTransport.php

@@ -67,7 +67,7 @@ public function __construct(
         parent::__construct($logger);
     }
 
-    public function connectAndInitialize(): void
+    public function connect(): void
     {
         $this->spawnProcess();
 

src/Client/Transport/TransportInterface.php

@@ -39,7 +39,7 @@ interface TransportInterface
      *
      * @throws \Mcp\Exception\ConnectionException
      */
-    public function connectAndInitialize(): void;
+    public function connect(): void;
 
     /**
      * Send a message to the server immediately.