Updated to new version

Author: Ekstazi

src/Connection.php

@@ -2,54 +2,26 @@
 
 namespace ekstazi\websocket\client\amphp;
 
-use Amp\Promise;
+use Amp\Websocket\Client;
 use ekstazi\websocket\client\Connection as ConnectionInterface;
-use ekstazi\websocket\common\Connection as BaseConnection;
+use ekstazi\websocket\common\amphp\Reader;
+use ekstazi\websocket\common\amphp\Writer;
+use ekstazi\websocket\common\internal\Connection as BaseConnection;
 
-final class Connection implements ConnectionInterface
+final class Connection extends BaseConnection implements ConnectionInterface
 {
+
     /**
-     * @var BaseConnection
+     * Create stream from client.
+     * @param Client $client
+     * @param string $defaultMode
+     * @return Connection
      */
-    private $connection;
-
-    public function __construct(BaseConnection $connection)
-    {
-        $this->connection = $connection;
-    }
-
-    public function getId(): int
-    {
-        return $this->connection->getId();
-    }
-
-    public function getRemoteAddress(): string
-    {
-        return $this->connection->getRemoteAddress();
-    }
-
-    public function read(): Promise
-    {
-        return $this->connection->read();
-    }
-
-    public function setDefaultMode(string $defaultMode): void
-    {
-        $this->connection->setDefaultMode($defaultMode);
-    }
-
-    public function getDefaultMode(): string
-    {
-        return $this->connection->getDefaultMode();
-    }
-
-    public function write(string $data, string $mode = null): Promise
-    {
-        return $this->connection->write($data, $mode);
-    }
-
-    public function end(string $finalData = "", string $mode = null): Promise
+    public static function create(Client $client, string $defaultMode = Writer::MODE_BINARY): self
     {
-        return $this->connection->end($finalData, $mode);
+        return new static(
+            new Reader($client),
+            new Writer($client, $defaultMode)
+        );
     }
 }

src/Connector.php

@@ -37,8 +37,7 @@ public function connect(RequestInterface $request, string $defaultMode = Connect
             $options = $options ?? $this->defaultOptions;
             $handshake = new Handshake($request->getUri(), $options);
             $client = yield $this->connector->connect($handshake->withHeaders($request->getHeaders()));
-            $adapter = BaseConnection::create($client, $defaultMode);
-            return new Connection($adapter);
+            return Connection::create($client, $defaultMode);
         });
     }
 }

test/ConnectionTest.php

@@ -2,120 +2,27 @@
 
 namespace ekstazi\websocket\client\amphp\test;
 
-use Amp\ByteStream\Payload;
 use Amp\PHPUnit\AsyncTestCase;
-use Amp\Success;
+use Amp\Websocket\Client;
 use ekstazi\websocket\client\amphp\Connection;
-use ekstazi\websocket\common\Connection as BaseConnection;
+use ekstazi\websocket\common\Writer;
 
 class ConnectionTest extends AsyncTestCase
 {
-
-    /**
-     * @param Payload $data
-     * @return BaseConnection
-     */
-    private function stubRead(Payload $data = null): BaseConnection
-    {
-        $connection = $this->createMock(BaseConnection::class);
-        $connection
-            ->expects(self::once())
-            ->method('read')
-            ->willReturn(new Success($data));
-        return $connection;
-    }
-
-    /**
-     * Test that data readed from websocket client.
-     * @return \Generator
-     * @throws
-     */
-    public function testRead()
+    public function testCreate()
     {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('read')
-            ->willReturn(new Success('test'));
-
-        $connection = new Connection($client);
-        $data = yield $connection->read();
-        self::assertEquals('test', $data);
-    }
-
-    /**
-     * Test write method with data and different modes.
-     * @return \Generator
-     * @throws
-     */
-    public function testWrite()
-    {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('write')
-            ->with('test', Connection::MODE_BINARY)
-            ->willReturn(new Success());
-
-        $connection = new Connection($client);
-        yield $connection->write('test', Connection::MODE_BINARY);
+        $client = $this->createClient();
+        $stream = Connection::create($client, Writer::MODE_BINARY);
+        self::assertInstanceOf(Connection::class, $stream);
+        self::assertEquals(Writer::MODE_BINARY, $stream->getDefaultMode());
     }
 
     /**
-     * @return \Generator
-     * @throws
+     * @return Client
      */
-    public function testEnd()
+    private function createClient(): Client
     {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('end')
-            ->with('test', Connection::MODE_BINARY)
-            ->willReturn(new Success());
-
-        $connection = new Connection($client);
-        yield $connection->end('test', Connection::MODE_BINARY);
+        return $this->createStub(Client::class);
     }
 
-    public function testSetDefaultMode()
-    {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('setDefaultMode')
-            ->with(Connection::MODE_BINARY);
-
-        $connection = new Connection($client);
-        $connection->setDefaultMode(Connection::MODE_BINARY);
-    }
-
-    public function testGetDefaultMode()
-    {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('getDefaultMode')
-            ->willReturn(Connection::MODE_BINARY);
-
-        $connection = new Connection($client);
-        self::assertEquals(Connection::MODE_BINARY, $connection->getDefaultMode());
-    }
-
-    public function testGetRemoteAddress()
-    {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('getRemoteAddress')
-            ->willReturn('127.0.0.2');
-
-        $connection = new Connection($client);
-        self::assertEquals('127.0.0.2', $connection->getRemoteAddress());
-    }
-
-    public function testGetId()
-    {
-        $client = $this->createMock(BaseConnection::class);
-        $client->expects(self::once())
-            ->method('getId')
-            ->willReturn(1);
-
-        $connection = new Connection($client);
-        self::assertEquals(1, $connection->getId());
-    }
 }

test/ConnectorTest.php

@@ -37,16 +37,9 @@ private function stubRequest(): RequestInterface
         return $request;
     }
 
-    private function stubClient($asDefault = true): Client
+    private function stubClient(): Client
     {
-        $client = $this->createMock(Client::class);
-        $client->expects($asDefault ? self::once() : self::never())
-            ->method('getRemoteAddress')
-            ->willReturn(new SocketAddress('127.0.0.2', 8000));
-        $client->expects($asDefault ? self::once() : self::never())
-            ->method('getId')
-            ->willReturn(1);
-        return $client;
+        return $this->createMock(Client::class);
     }