Merge pull request #11 from scaytrase/feature/fixes-and-simplification

Fixes and simplification

Author: scaytrase

.gitignore

@@ -1,7 +1,6 @@
 composer.lock
 composer.phar
 vendor/
-.idea/
 
 build/
 target/

README.md

@@ -0,0 +1,5 @@
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/9706918a-39d4-4822-8e25-d0a01182b10b/big.png)](https://insight.sensiolabs.com/projects/9706918a-39d4-4822-8e25-d0a01182b10b)
+
+# RPC Library
+
+## JSON-RPC Implementation

composer.json

@@ -21,7 +21,7 @@
   },
   "autoload": {
     "psr-4": {
-      "": "src/"
+      "ScayTrase\\Api\\": "src/ScayTrase/Api/"
     }
   },
   "suggest": {

phpmd.xml

@@ -55,4 +55,4 @@
     <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
     <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
     <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
-</ruleset>
+</ruleset>

src/ScayTrase/Api/JsonRpc/JsonRpcResponseCollection.php

@@ -131,11 +131,4 @@ public function getResponse(RpcRequestInterface $request)
 
         return $this->hashedResponses[spl_object_hash($request)];
     }
-
-    /** {@inheritdoc} */
-    public function count()
-    {
-        $this->sync();
-        return count($this->responses);
-    }
 }

src/ScayTrase/Api/Rpc/Decorators/CacheableResponseCollection.php

@@ -70,12 +70,6 @@ public function getResponse(RpcRequestInterface $request)
         return $item->get();
     }
 
-    /** {@inheritdoc} */
-    public function count()
-    {
-        return count($this->items) + $this->proxiedCollection->count();
-    }
-
     /** {@inheritdoc} */
     public function getIterator()
     {

src/ScayTrase/Api/Rpc/Decorators/LazyResponseCollection.php

@@ -48,16 +48,6 @@ private function init()
         $this->initialized = true;
     }
 
-    /** {@inheritdoc} */
-    public function count()
-    {
-        if (!$this->initialized) {
-            $this->init();
-        }
-
-        return $this->collection->count();
-    }
-
     public function append(RpcRequestInterface $request)
     {
         if ($this->isFrozen()) {

src/ScayTrase/Api/Rpc/Decorators/LoggableResponseCollection.php

@@ -11,13 +11,16 @@
 use Psr\Log\LoggerInterface;
 use ScayTrase\Api\Rpc\ResponseCollectionInterface;
 use ScayTrase\Api\Rpc\RpcRequestInterface;
+use ScayTrase\Api\Rpc\RpcResponseInterface;
 
 final class LoggableResponseCollection implements \IteratorAggregate, ResponseCollectionInterface
 {
     /** @var  LoggerInterface */
     private $logger;
     /** @var  ResponseCollectionInterface */
     private $decoratedCollection;
+    /** @var string[]  */
+    private $loggedResponses = [];
 
     /**
      * LoggableResponseCollection constructor.
@@ -35,43 +38,72 @@ public function __construct(ResponseCollectionInterface $decoratedCollection, Lo
     public function getResponse(RpcRequestInterface $request)
     {
         $response = $this->decoratedCollection->getResponse($request);
+        $this->logResponseWithRequest($request, $response);
+
+        return $response;
+    }
+
+    /** {@inheritdoc} */
+    public function getIterator()
+    {
+        foreach ($this->decoratedCollection as $response) {
+            $this->logResponse($response);
+            yield $response;
+        }
+    }
+
+    /**
+     * @param RpcRequestInterface $request
+     * @param RpcResponseInterface $response
+     */
+    private function logResponseWithRequest(RpcRequestInterface $request, RpcResponseInterface $response)
+    {
+        $hash = spl_object_hash($response);
+        if (in_array($hash, $this->loggedResponses, true)) {
+            return;
+        }
 
-        $this->logger->debug(
-            sprintf(
-                '%s Response for RPC method "%s" is %s',
-                spl_object_hash($request),
-                $request->getMethod(),
-                $response->isSuccessful() ? 'Successful' : 'Failed'
-            ),
-            json_decode(json_encode($response->getBody()), true)
-        );
         if ($response->isSuccessful()) {
+            $this->logger->info(
+                sprintf('Method "%s" call was successful', $request->getMethod()),
+                ['request_hash' => spl_object_hash($request)]
+            );
             $this->logger->debug(
-                sprintf('%s Response for RPC method "%s"', spl_object_hash($request), $request->getMethod()),
-                json_decode(json_encode($response->getBody()), true)
+                sprintf("Resposne:\n%s", json_encode($response->getBody(), JSON_PRETTY_PRINT)),
+                ['request_hash' => spl_object_hash($request)]
             );
         } else {
-            $this->logger->debug(
-                sprintf('%s Response for RPC method "%s"', spl_object_hash($request), $request->getMethod()),
-                json_decode(json_encode($response->getError()), true)
+            $this->logger->info(
+                sprintf('Method "%s" call was failed', $request->getMethod()),
+                ['request_hash' => spl_object_hash($request)]
+            );
+            $this->logger->error(
+                sprintf('ERROR %s: %s', $response->getError()->getCode(), $response->getError()->getMessage()),
+                ['request_hash' => spl_object_hash($request)]
             );
         }
 
-        return $response;
+        $this->loggedResponses[] = $hash;
     }
 
-    /** {@inheritdoc} */
-    public function count()
+    private function logResponse(RpcResponseInterface $response)
     {
-        return $this->decoratedCollection->count();
-    }
+        $hash = spl_object_hash($response);
+        if (in_array($hash, $this->loggedResponses, true)) {
+            return;
+        }
 
-    /** {@inheritdoc} */
-    public function getIterator()
-    {
-        foreach ($this->decoratedCollection as $response) {
-            //todo: log
-            yield $response;
+        if ($response->isSuccessful()) {
+            $this->logger->info('Successful RPC call');
+            $this->logger->debug(
+                sprintf("Resposne:\n%s", json_encode($response->getBody(), JSON_PRETTY_PRINT))
+            );
+        } else {
+            $this->logger->error(
+                sprintf('RPC Error %s: %s', $response->getError()->getCode(), $response->getError()->getMessage())
+            );
         }
+
+        $this->loggedResponses[] = $hash;
     }
 }

src/ScayTrase/Api/Rpc/ResponseCollectionInterface.php

@@ -9,7 +9,7 @@
 
 use ScayTrase\Api\Rpc\Exception\RpcExceptionInterface;
 
-interface ResponseCollectionInterface extends \Countable, \Traversable
+interface ResponseCollectionInterface extends \Traversable
 {
     /**
      * @param RpcRequestInterface $request