Merge pull request #10 from DawidMazurek/jsonrpcserver-JsonRpcInput

Handle parse error correctly, replace JsonRpcServer param by JsonRpcInput
DawidMazurek · Feb 22, 2018 · 9a25b08 · 9a25b08
2 parents f8410f3 + f18f40d
commit 9a25b08
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 12 deletions.
diff --git a/examples/server.php b/examples/server.php
@@ -31,6 +31,6 @@
     new JsonRpcRequestBuilder(new JsonSerializer())
 );
 
-$response = $server->run($input->getRequest());
+$response = $server->run($input);
 
 echo json_encode($response->serialize());
diff --git a/src/handler/JsonRpcRequestHandler.php b/src/handler/JsonRpcRequestHandler.php
@@ -4,11 +4,13 @@
 
 namespace DawidMazurek\JsonRpc\handler;
 
+use DawidMazurek\JsonRpc\exception\JsonRpcException;
 use DawidMazurek\JsonRpc\request\JsonRpcRequest;
 use DawidMazurek\JsonRpc\response\JsonRpcResponse;
 
 interface JsonRpcRequestHandler
 {
     public function registerForMethod(string $method, callable $callback);
     public function handle(JsonRpcRequest $request): JsonRpcResponse;
+    public function handleError(JsonRpcException $exception): JsonRpcResponse;
 }
diff --git a/src/handler/MethodCallableHandler.php b/src/handler/MethodCallableHandler.php
@@ -36,6 +36,15 @@ public function handle(JsonRpcRequest $request): JsonRpcResponse
         }
     }
 
+    public function handleError(JsonRpcException $exception): JsonRpcResponse
+    {
+        return new FailedResponse(
+            "2.0",
+            $exception->getCode(),
+            $exception->getMessage()
+        );
+    }
+
     private function createErrorResponse(JsonRpcRequest $request, JsonRpcException $exception): JsonRpcResponse
     {
         if ($request instanceof Request) {

diff --git a/src/response/FailedResponse.php b/src/response/FailedResponse.php
@@ -11,7 +11,7 @@ class FailedResponse implements JsonRpcResponse
     private $message;
     private $requestId;
 
-    public function __construct(string $apiVersion, int $errorCode, string $message, int $requestId)
+    public function __construct(string $apiVersion, int $errorCode, string $message, int $requestId = null)
     {
         $this->apiVersion = $apiVersion;
         $this->errorCode = $errorCode;

diff --git a/src/server/JsonRpcServer.php b/src/server/JsonRpcServer.php
@@ -4,8 +4,9 @@
 
 namespace DawidMazurek\JsonRpc\server;
 
+use DawidMazurek\JsonRpc\exception\JsonRpcException;
 use DawidMazurek\JsonRpc\handler\JsonRpcRequestHandler;
-use DawidMazurek\JsonRpc\request\JsonRpcRequestAggregate;
+use DawidMazurek\JsonRpc\io\JsonRpcInput;
 use DawidMazurek\JsonRpc\response\JsonRpcResponseAggregate;
 
 class JsonRpcServer
@@ -17,13 +18,19 @@ public function __construct(JsonRpcRequestHandler $handler)
         $this->handler = $handler;
     }
 
-    public function run(JsonRpcRequestAggregate $requests): JsonRpcResponseAggregate
+    public function run(JsonRpcInput $input): JsonRpcResponseAggregate
     {
-        $responseAggregate = new JsonRpcResponseAggregate();
-
-        foreach ($requests->getAll() as $request) {
+        try {
+            $responseAggregate = new JsonRpcResponseAggregate();
+
+            foreach ($input->getRequest()->getAll() as $request) {
+                $responseAggregate->addResponse(
+                    $this->handler->handle($request)
+                );
+            }
+        } catch (JsonRpcException $exception) {
             $responseAggregate->addResponse(
-                $this->handler->handle($request)
+                $this->handler->handleError($exception)
             );
         }
 

diff --git a/tests/integration/JsonRpcServerIntegrationTest.php b/tests/integration/JsonRpcServerIntegrationTest.php
@@ -76,6 +76,6 @@ private function runWithCustomPayload(string $json): JsonRpcResponseAggregate
             new JsonRpcRequestBuilder(new JsonSerializer())
         );
 
-       return $server->run($input->getRequest());
+        return $server->run($input);
     }
 }
diff --git a/tests/unit/handler/MethodCallableHandlerTest.php b/tests/unit/handler/MethodCallableHandlerTest.php
@@ -4,6 +4,7 @@
 
 namespace DawidMazurek\JsonRpc\handler;
 
+use DawidMazurek\JsonRpc\exception\ParseError;
 use DawidMazurek\JsonRpc\request\JsonRpcRequest;
 use DawidMazurek\JsonRpc\request\Notification;
 use DawidMazurek\JsonRpc\request\Request;
@@ -97,4 +98,16 @@ public function returnsErrorResponseForNotificationRequest()
         $response = $handler->handle($request);
         $this->assertInstanceOf(NotificationResponse::class, $response);
     }
+
+    /**
+     * @test
+     */
+    public function returnsFailedResponseWhenHandlingError()
+    {
+        $exception = new ParseError();
+
+        $handler = new MethodCallableHandler();
+        $response = $handler->handleError($exception);
+        $this->assertInstanceOf(FailedResponse::class, $response);
+    }
 }
diff --git a/tests/unit/server/JsonRpcServerTest.php b/tests/unit/server/JsonRpcServerTest.php
@@ -4,9 +4,14 @@
 
 namespace DawidMazurek\JsonRpc\server;
 
+use DawidMazurek\JsonRpc\exception\ParseError;
 use DawidMazurek\JsonRpc\handler\JsonRpcRequestHandler;
+use DawidMazurek\JsonRpc\io\JsonRpcInput;
+use DawidMazurek\JsonRpc\request\JsonRpcRequest;
 use DawidMazurek\JsonRpc\request\JsonRpcRequestAggregate;
 use DawidMazurek\JsonRpc\request\Request;
+use DawidMazurek\JsonRpc\response\FailedResponse;
+use DawidMazurek\JsonRpc\response\JsonRpcResponse;
 use PHPUnit\Framework\TestCase;
 
 class JsonRpcServerTest extends TestCase
@@ -42,8 +47,13 @@ public function handlesRequest()
             1
         ));
 
+        $input = $this->createMock(JsonRpcInput::class);
+        $input->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->requests);
+
         $server = new JsonRpcServer($this->requestHandler);
-        $server->run($this->requests);
+        $server->run($input);
     }
 
 
@@ -68,18 +78,53 @@ public function handlesMultipleRequests()
             2
         ));
 
+        $input = $this->createMock(JsonRpcInput::class);
+        $input->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->requests);
+
         $server = new JsonRpcServer($this->requestHandler);
-        $server->run($this->requests);
+        $server->run($input);
     }
 
     /**
      * @test
      */
     public function returnsEmptyResponseForEmptyInput()
     {
+        $input = $this->createMock(JsonRpcInput::class);
+        $input->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->requests);
+
         $server = new JsonRpcServer($this->requestHandler);
         $this->assertEmpty(
-            $server->run($this->requests)->getAll()
+            $server->run($input)->getAll()
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function handlesExceptionWhileHandlingRequest()
+    {
+        $input = $this->createMock(JsonRpcInput::class);
+        $input->expects($this->once())
+            ->method('getRequest')
+            ->willThrowException(new ParseError());
+
+        $server = new JsonRpcServer($this->requestHandler);
+
+        $response = $server->run($input)->getAll();
+
+        $this->assertContainsOnlyInstancesOf(
+            JsonRpcResponse::class,
+            $response
+        );
+
+        $this->assertEquals(
+            1,
+            count($response)
         );
     }
 }