Updated clients

Author: WyriHaximus

src/AsyncClient.php

@@ -3,6 +3,8 @@
 
 namespace ApiClients\Client\RabbitMQ\Management;
 
+use ApiClients\Foundation\ClientInterface as FoundationClientInterface;
+use ApiClients\Foundation\Factory;
 use ApiClients\Foundation\Hydrator\CommandBus\Command\HydrateCommand;
 use ApiClients\Foundation\Transport\CommandBus\Command\SimpleRequestCommand;
 use Psr\Http\Message\ResponseInterface;
@@ -11,35 +13,54 @@
 use Rx\Observable;
 use Rx\ObservableInterface;
 use Rx\React\Promise;
-use ApiClients\Foundation\Client;
-use ApiClients\Foundation\Factory;
 use function React\Promise\resolve;
 
-final class AsyncClient
+final class AsyncClient implements AsyncClientInterface
 {
     /**
-     * @var Client
+     * @var FoundationClientInterface
      */
-    protected $client;
+    private $client;
 
     /**
+     * Create a new AsyncClient based on the loop and other options pass
+     *
      * @param LoopInterface $loop
      * @param string $baseUrl
      * @param string $username
      * @param string $password
-     * @param Client|null $client
+     * @param array $options
+     * @return AsyncClient
      */
-    public function __construct(
+    public static function create(
         LoopInterface $loop,
         string $baseUrl,
         string $username,
         string $password,
-        Client $client = null
-    ) {
-        if (!($client instanceof Client)) {
-            $options = ApiSettings::getOptions($baseUrl, $username, $password, 'Async');
-            $client = Factory::create($loop, $options);
-        }
+        array $options = []
+    ): self {
+        $options = ApiSettings::getOptions($baseUrl, $username, $password, 'Async');
+        $client = Factory::create($loop, $options);
+        return new self($client);
+    }
+
+    /**
+     * Create an AsyncClient from a ApiClients\Foundation\ClientInterface.
+     * Be sure to pass in a client with the options from ApiSettings and the Async namespace suffix.
+     *
+     * @param FoundationClientInterface $client
+     * @return AsyncClient
+     */
+    public static function createFromClient(FoundationClientInterface $client): self
+    {
+        return new self($client);
+    }
+
+    /**
+     * @param FoundationClientInterface $client
+     */
+    private function __construct(FoundationClientInterface $client)
+    {
         $this->client = $client;
     }
 

src/AsyncClientInterface.php

@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace ApiClients\Client\RabbitMQ\Management;
+
+use React\Promise\PromiseInterface;
+use Rx\Observable;
+use Rx\ObservableInterface;
+use function React\Promise\resolve;
+
+interface AsyncClientInterface
+{
+    /**
+     * @return PromiseInterface
+     */
+    public function overview(): PromiseInterface;
+
+    /**
+     * @return ObservableInterface
+     */
+    public function queues(): ObservableInterface;
+
+    /**
+     * @return ObservableInterface
+     */
+    public function connections(): ObservableInterface;
+}

src/Client.php

@@ -3,46 +3,70 @@
 
 namespace ApiClients\Client\RabbitMQ\Management;
 
-use ApiClients\Foundation\Hydrator\Options;
+use ApiClients\Client\RabbitMQ\Management\Resource\OverviewInterface;
+use ApiClients\Foundation\Factory;
 use React\EventLoop\Factory as LoopFactory;
+use React\EventLoop\LoopInterface;
 use Rx\React\Promise;
-use ApiClients\Client\RabbitMQ\Management\Resource\OverviewInterface;
-use ApiClients\Foundation\Transport\Client as Transport;
-use ApiClients\Foundation\Transport\Factory;
 use function Clue\React\Block\await;
 use function React\Promise\resolve;
 
-final class Client
+final class Client implements ClientInterface
 {
     /**
-     * @var Transport
+     * @var LoopInterface
      */
-    protected $transport;
+    private $loop;
 
     /**
-     * @var AsyncClient
+     * @var AsyncClientInterface
      */
-    protected $client;
+    private $asyncClient;
 
     /**
+     * Create a new AsyncClient based on the loop and other options pass
+     *
      * @param string $baseUrl
      * @param string $username
      * @param string $password
-     * @param Transport|null $transport
+     * @param array $options
+     * @return Client
      */
-    public function __construct(
+    public static function create(
         string $baseUrl,
         string $username,
         string $password,
-        Transport $transport = null
-    ) {
+        array $options = []
+    ): self {
         $loop = LoopFactory::create();
-        if (!($transport instanceof Transport)) {
-            $options = ApiSettings::getOptions($baseUrl, $username, $password, 'Sync');
-            $transport = Factory::create($loop, $options);
-        }
-        $this->transport = $transport;
-        $this->client = new AsyncClient($loop, $baseUrl, $username, $password, $this->transport);
+        $options = ApiSettings::getOptions($baseUrl, $username, $password, 'Sync');
+        $client = Factory::create($loop, $options);
+        $asyncClient = AsyncClient::createFromClient($client);
+        return self::createFromClient($loop, $asyncClient);
+    }
+
+    /**
+     * Create an Client from a AsyncClientInterface.
+     * Be sure to pass in a client with the options from ApiSettings and the Sync namespace suffix,
+     * and pass in the same loop as associated with the AsyncClient you're passing in.
+     *
+     * @param LoopInterface $loop
+     * @param AsyncClientInterface $asyncClient
+     * @return Client
+     */
+    public static function createFromClient(LoopInterface $loop, AsyncClientInterface $asyncClient): self
+    {
+        return new self($loop, $asyncClient);
+    }
+
+    /**
+     * @param LoopInterface $loop
+     * @param AsyncClientInterface $asyncClient
+     */
+    private function __construct(LoopInterface $loop, AsyncClientInterface $asyncClient)
+    {
+        $this->loop = $loop;
+        $this->asyncClient = $asyncClient;
     }
 
     /**
@@ -51,8 +75,8 @@ public function __construct(
     public function overview(): OverviewInterface
     {
         return await(
-            $this->client->overview(),
-            $this->transport->getLoop()
+            $this->asyncClient->overview(),
+            $this->loop
         );
     }
 
@@ -63,9 +87,9 @@ public function queues(): array
     {
         return await(
             Promise::fromObservable(
-                $this->client->queues()->toArray()
+                $this->asyncClient->queues()->toArray()
             ),
-            $this->transport->getLoop()
+            $this->loop
         );
     }
 
@@ -76,9 +100,9 @@ public function connections(): array
     {
         return await(
             Promise::fromObservable(
-                $this->client->connections()->toArray()
+                $this->asyncClient->connections()->toArray()
             ),
-            $this->transport->getLoop()
+            $this->loop
         );
     }
 }

src/ClientInterface.php

@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+namespace ApiClients\Client\RabbitMQ\Management;
+
+use ApiClients\Client\RabbitMQ\Management\Resource\OverviewInterface;
+use function Clue\React\Block\await;
+use function React\Promise\resolve;
+
+interface ClientInterface
+{
+    /**
+     * @return OverviewInterface
+     */
+    public function overview(): OverviewInterface;
+
+    /**
+     * @return array
+     */
+    public function queues(): array;
+
+    /**
+     * @return array
+     */
+    public function connections(): array;
+}