Extrac node WebServer

Author: akondas

bin/node

@@ -3,9 +3,6 @@
 
 use React\EventLoop\Factory;
 use React\Http\Server as HttpServer;
-use Psr\Http\Message\ServerRequestInterface;
-use Blockchain\Node\Response\JsonResponse;
-use React\Http\Response;
 use React\Socket\Server;
 use Blockchain\Node;
 use Blockchain\Miner;
@@ -18,27 +15,14 @@ require __DIR__.'/../vendor/autoload.php';
 $loop = Factory::create();
 
 $node = new Node(new Miner(new Blockchain(Block::genesis()), new HashDifficulty\ZeroPrefix()));
+$webServer = new HttpServer(new Node\WebServer($node));
 
-$server = new HttpServer(function (ServerRequestInterface $request) use ($node) {
-    switch (trim($request->getUri()->getPath(), '/')) {
-        case 'blocks':
-            return new JsonResponse($node->blocks());
-        case 'mine':
-            return new JsonResponse($node->mineBlock($request->getBody()->getContents()));
-        case 'peers':
-            return new JsonResponse($node->peers());
-        case 'peers/add':
-            $data = json_decode($request->getBody()->getContents(), true);
-            $node->addPeer(new Node\Peer($data['host'], $data['port']));
-            return new Response(204);
-        default:
-            return new Response(404);
-    }
-});
-
-$socket = new Server(8080, $loop);
-$server->listen($socket);
-
-echo "Server running at http://127.0.0.1:8080\n";
+$params = getopt('', ['port::']);
+$port = $params['port'] ?? 8080;
+
+$socket = new Server($port, $loop);
+$webServer->listen($socket);
+
+echo sprintf("Server running at http://127.0.0.1:%s\n", $port);
 
 $loop->run();

src/Block.php

@@ -113,6 +113,11 @@ public function index(): int
         return $this->index;
     }
 
+    public function data(): string
+    {
+        return $this->data;
+    }
+
     public static function calculateHash(
         int $index,
         string $previousHash,

src/Node.php

@@ -37,7 +37,7 @@ public function blocks(): array
     public function mineBlock(string $data): Block
     {
         $block = $this->miner->mineBlock($data);
-        $this->peers->broadcast(new Message(Message::TYPE_LAST_BLOCK, serialize($block)));
+        $this->peers->broadcast(new Message(Message::TYPE_LAST_BLOCK, json_encode($block)));
 
         return $block;
     }

src/Node/WebServer.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blockchain\Node;
+
+use Blockchain\Node;
+use Blockchain\Node\Response\JsonResponse;
+use Psr\Http\Message\ServerRequestInterface;
+use React\Http\Response;
+
+final class WebServer
+{
+    /**
+     * @var Node
+     */
+    private $node;
+
+    public function __construct(Node $node)
+    {
+        $this->node = $node;
+    }
+
+    public function __invoke(ServerRequestInterface $request): Response
+    {
+        switch ($request->getMethod().':'.trim($request->getUri()->getPath(), '/')) {
+            case 'GET:blocks':
+                return new JsonResponse($this->node->blocks());
+            case 'POST:mine':
+                return new JsonResponse($this->node->mineBlock($request->getBody()->getContents()));
+            case 'GET:peers':
+                return new JsonResponse($this->node->peers());
+            case 'POST:peers/add':
+                $data = json_decode($request->getBody()->getContents(), true);
+                $this->node->addPeer(new Peer($data['host'], $data['port']));
+
+                return new Response(204);
+            default:
+                return new Response(404);
+        }
+    }
+}

tests/NodeTest.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blockchain;
+
+use Blockchain\Miner\HashDifficulty\ZeroPrefix;
+use PHPUnit\Framework\TestCase;
+
+final class NodeTest extends TestCase
+{
+    /**
+     * @var Node
+     */
+    private $node;
+
+    public function setUp(): void
+    {
+        $this->node = new Node(new Miner(new Blockchain(Block::genesis()), new ZeroPrefix()));
+    }
+
+    public function testListBlock(): void
+    {
+        $blocks = $this->node->blocks();
+        self::assertCount(1, $blocks);
+        self::assertInstanceOf(Block::class, $blocks[0]);
+    }
+
+    public function testMineBlock(): void
+    {
+        $block = $this->node->mineBlock('PHP is awesome');
+
+        self::assertInstanceOf(Block::class, $block);
+        self::assertEquals(1, $block->index());
+        self::assertEquals('PHP is awesome', $block->data());
+    }
+}