Adopt Schema component in server handlers

Author: chr-hertel

src/Message/Error.php

@@ -12,6 +12,8 @@
 namespace Mcp\Message;
 
 use Mcp\Exception\InvalidInputMessageException;
+use Mcp\Schema\JsonRpc\Notification;
+use Mcp\Schema\JsonRpc\Request;
 
 /**
  * @author Christopher Hertel <[email protected]>
@@ -35,9 +37,9 @@ public function create(string $input): iterable
             if (!isset($message['method'])) {
                 yield new InvalidInputMessageException('Invalid JSON-RPC request, missing "method".');
             } elseif (str_starts_with((string) $message['method'], 'notifications/')) {
-                yield Notification::from($message);
+                yield Notification::fromArray($message);
             } else {
-                yield Request::from($message);
+                yield Request::fromArray($message);
             }
         }
     }

src/Message/Factory.php

@@ -14,20 +14,8 @@
 /**
  * @author Kyrian Obikwelu <[email protected]>
  */
-final class Constants
+interface Constants
 {
     public const LATEST_PROTOCOL_VERSION = '2025-03-26';
     public const JSONRPC_VERSION = '2.0';
-
-    public const PARSE_ERROR = -32700;
-    public const INVALID_REQUEST = -32600;
-    public const METHOD_NOT_FOUND = -32601;
-    public const INVALID_PARAMS = -32602;
-    public const INTERNAL_ERROR = -32603;
-
-    public const SERVER_ERROR = -32000;
-
-    private function __construct()
-    {
-    }
 }

src/Message/Notification.php

@@ -11,26 +11,29 @@
 
 namespace Mcp\Schema\JsonRpc;
 
+use Mcp\Exception\InvalidArgumentException;
+
 /**
  * A JSON-RPC batch request, as described in https://www.jsonrpc.org/specification#batch.
  *
  * @author Kyrian Obikwelu <[email protected]>
  */
-class BatchRequest extends Message implements \Countable
+readonly class BatchRequest implements MessageInterface, \Countable
 {
     /**
      * Create a new JSON-RPC 2.0 batch of requests/notifications.
      */
-    public function __construct(public readonly array $items)
-    {
+    public function __construct(
+        public array $items,
+    ) {
         foreach ($items as $item) {
             if (!($item instanceof Request || $item instanceof Notification)) {
-                throw new \InvalidArgumentException('All items in BatchRequest must be instances of Request or Notification.');
+                throw new InvalidArgumentException('All items in BatchRequest must be instances of Request or Notification.');
             }
         }
     }
 
-    public function getId(): string|int|null
+    public function getId(): string|int
     {
         foreach ($this->items as $item) {
             if ($item instanceof Request) {
@@ -41,41 +44,28 @@ public function getId(): string|int|null
         return '';
     }
 
-    /**
-     * Create a new JSON-RPC 2.0 batch of requests/notifications.
-     */
-    public static function make(array $items): static
-    {
-        return new static($items);
-    }
-
-    public function toArray(): array
-    {
-        return array_map(fn ($item) => $item->toArray(), $this->items);
-    }
-
     public function jsonSerialize(): array
     {
-        return $this->toArray();
+        return $this->items;
     }
 
     public static function fromArray(array $data): static
     {
         if (empty($data)) {
-            throw new \InvalidArgumentException('BatchRequest data array must not be empty.');
+            throw new InvalidArgumentException('BatchRequest data array must not be empty.');
         }
 
         $items = [];
         foreach ($data as $itemData) {
             if (!\is_array($itemData)) {
-                throw new \InvalidArgumentException('BatchRequest item data must be an array.');
+                throw new InvalidArgumentException('BatchRequest item data must be an array.');
             }
             if (isset($itemData['id']) && null !== $itemData['id']) {
                 $items[] = Request::fromArray($itemData);
             } elseif (isset($itemData['method'])) {
                 $items[] = Notification::fromArray($itemData);
             } else {
-                throw new \InvalidArgumentException("Invalid item in BatchRequest data: missing 'method' or 'id'.");
+                throw new InvalidArgumentException("Invalid item in BatchRequest data: missing 'method' or 'id'.");
             }
         }