Update for amphp/socket v2.0

examples/proxy/socks4.php

@@ -12,7 +12,7 @@
 //use Amp\Http\Client\HttpException;
 //use Amp\Http\Client\Request;
 //use Amp\Socket\ConnectContext;
-//use Amp\Socket\EncryptableSocket;
+//use Amp\Socket\Socket;
 //use Amp\Socket\ResourceSocket;
 //use Amp\Socket\SocketAddress;
 //use Amp\Socket\SocketConnector;
@@ -26,7 +26,7 @@
 //            string $uri,
 //            ?ConnectContext $context = null,
 //            ?Cancellation $token = null
-//        ): EncryptableSocket {
+//        ): Socket {
 //            $context = $context ?? (new ConnectContext);
 //
 //            $options = $context->toStreamContextArray();

examples/proxy/socks5.php

@@ -11,7 +11,7 @@
 //use Amp\Http\Client\HttpException;
 //use Amp\Http\Client\Request;
 //use Amp\Socket\ConnectContext;
-//use Amp\Socket\EncryptableSocket;
+//use Amp\Socket\Socket;
 //use Amp\Socket\ResourceSocket;
 //use Amp\Socket\SocketConnector;
 //
@@ -23,7 +23,7 @@
 //            string $uri,
 //            ?ConnectContext $context = null,
 //            ?Cancellation $token = null
-//        ): EncryptableSocket {
+//        ): Socket {
 //            $context = $context ?? new ConnectContext;
 //
 //            $options = $context->toStreamContextArray();

src/Connection/Http1Connection.php

@@ -3,6 +3,7 @@
 namespace Amp\Http\Client\Connection;
 
 use Amp\ByteStream\ReadableIterableStream;
+use Amp\ByteStream\ResourceStream;
 use Amp\ByteStream\StreamException;
 use Amp\Cancellation;
 use Amp\CancelledException;
@@ -26,7 +27,7 @@
 use Amp\Http\InvalidHeaderException;
 use Amp\Http\Rfc7230;
 use Amp\Pipeline\Queue;
-use Amp\Socket\EncryptableSocket;
+use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Amp\Socket\TlsInfo;
 use Amp\TimeoutCancellation;
@@ -48,7 +49,7 @@ final class Http1Connection implements Connection
     private const MAX_KEEP_ALIVE_TIMEOUT = 60;
     private const PROTOCOL_VERSIONS = ['1.0', '1.1'];
 
-    private ?EncryptableSocket $socket;
+    private ?Socket $socket;
 
     private bool $busy = false;
 
@@ -78,7 +79,7 @@ final class Http1Connection implements Connection
 
     private ?Future $idleRead = null;
 
-    public function __construct(EncryptableSocket $socket, float $timeoutGracePeriod = 2)
+    public function __construct(Socket $socket, float $timeoutGracePeriod = 2)
     {
         $this->socket = $socket;
         $this->localAddress = $socket->getLocalAddress();
@@ -192,7 +193,9 @@ private function request(Request $request, Cancellation $cancellation, Stream $s
     {
         ++$this->requestCounter;
 
-        $this->socket?->reference();
+        if ($this->socket instanceof ResourceStream) {
+            $this->socket->reference();
+        }
 
         if ($this->timeoutWatcher !== null) {
             EventLoop::cancel($this->timeoutWatcher);
@@ -671,7 +674,10 @@ private function generateRawHeader(Request $request, string $protocolVersion): s
 
     private function watchIdleConnection(): void
     {
-        $this->socket?->unreference();
+        if ($this->socket instanceof ResourceStream) {
+            $this->socket->unreference();
+        }
+
         $this->idleRead = async(function (): ?string {
             $chunk = null;
             try {

src/Connection/Http2Connection.php

@@ -9,7 +9,7 @@
 use Amp\Http\Client\Connection\Internal\Http2ConnectionProcessor;
 use Amp\Http\Client\Request;
 use Amp\Http\Client\Response;
-use Amp\Socket\EncryptableSocket;
+use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Amp\Socket\TlsInfo;
 use Amp\TimeoutCancellation;
@@ -21,15 +21,12 @@ final class Http2Connection implements Connection
 
     private const PROTOCOL_VERSIONS = ['2'];
 
-    private EncryptableSocket $socket;
-
-    private Http2ConnectionProcessor $processor;
+    private readonly Http2ConnectionProcessor $processor;
 
     private int $requestCount = 0;
 
-    public function __construct(EncryptableSocket $socket)
+    public function __construct(private readonly Socket $socket)
     {
-        $this->socket = $socket;
         $this->processor = new Http2ConnectionProcessor($socket);
     }
 

src/Connection/Internal/Http2ConnectionProcessor.php

@@ -5,6 +5,7 @@
 
 use Amp\ByteStream\ReadableBuffer;
 use Amp\ByteStream\ReadableIterableStream;
+use Amp\ByteStream\ResourceStream;
 use Amp\ByteStream\StreamException;
 use Amp\Cancellation;
 use Amp\CancelledException;
@@ -31,8 +32,8 @@
 use Amp\Http\HttpStatus;
 use Amp\Http\InvalidHeaderException;
 use Amp\Pipeline\Queue;
-use Amp\Socket\EncryptableSocket;
 use Amp\Socket\InternetAddress;
+use Amp\Socket\Socket;
 use League\Uri;
 use Revolt\EventLoop;
 use function Amp\async;
@@ -98,7 +99,7 @@ final class Http2ConnectionProcessor implements Http2Processor
     private readonly Queue $frameQueue;
 
     public function __construct(
-        private readonly EncryptableSocket $socket,
+        private readonly Socket $socket,
     ) {
         $this->hpack = new HPack();
         $this->frameQueue = new Queue();
@@ -956,7 +957,9 @@ public function request(Request $request, Cancellation $cancellation, Stream $st
             throw $exception;
         }
 
-        $this->socket->reference();
+        if ($this->socket instanceof ResourceStream) {
+            $this->socket->reference();
+        }
 
         // Assign a stream ID just before sending the first frame so another request cannot send a frame with
         // a higher ID prior to the initial frame of this stream.
@@ -1357,7 +1360,7 @@ private function releaseStream(int $streamId, ?\Throwable $exception = null): vo
             }
         }
 
-        if (!$this->streams && !$this->socket->isClosed()) {
+        if (!$this->streams && !$this->socket->isClosed() && $this->socket instanceof ResourceStream) {
             $this->socket->unreference();
         }
     }

src/Connection/UpgradedSocket.php

@@ -3,18 +3,19 @@
 namespace Amp\Http\Client\Connection;
 
 use Amp\ByteStream\ReadableStreamIteratorAggregate;
+use Amp\ByteStream\ResourceStream;
 use Amp\Cancellation;
 use Amp\ForbidCloning;
 use Amp\ForbidSerialization;
-use Amp\Socket\EncryptableSocket;
+use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Amp\Socket\TlsInfo;
 use Amp\Socket\TlsState;
 
 /**
  * @implements \IteratorAggregate<int, string>
  */
-final class UpgradedSocket implements EncryptableSocket, \IteratorAggregate
+final class UpgradedSocket implements Socket, ResourceStream, \IteratorAggregate
 {
     use ForbidCloning;
     use ForbidSerialization;
@@ -25,7 +26,7 @@ final class UpgradedSocket implements EncryptableSocket, \IteratorAggregate
     /**
      * @param string $buffer Remaining buffer previously read from the socket.
      */
-    public function __construct(private readonly EncryptableSocket $socket, string $buffer)
+    public function __construct(private readonly Socket $socket, string $buffer)
     {
         $this->buffer = $buffer !== '' ? $buffer : null;
     }
@@ -71,12 +72,16 @@ public function end(): void
 
     public function reference(): void
     {
-        $this->socket->reference();
+        if ($this->socket instanceof ResourceStream) {
+            $this->socket->reference();
+        }
     }
 
     public function unreference(): void
     {
-        $this->socket->unreference();
+        if ($this->socket instanceof ResourceStream) {
+            $this->socket->unreference();
+        }
     }
 
     public function isClosed(): bool
@@ -109,9 +114,9 @@ public function shutdownTls(?Cancellation $cancellation = null): void
         $this->socket->shutdownTls();
     }
 
-    public function isTlsAvailable(): bool
+    public function isTlsConfigurationAvailable(): bool
     {
-        return $this->socket->isTlsAvailable();
+        return $this->socket->isTlsConfigurationAvailable();
     }
 
     public function getTlsState(): TlsState
@@ -136,6 +141,8 @@ public function isWritable(): bool
 
     public function getResource()
     {
-        return $this->socket->getResource();
+        return $this->socket instanceof ResourceStream
+            ? $this->socket->getResource()
+            : null;
     }
 }

test/ClientHttpBinIntegrationTest.php

@@ -30,7 +30,7 @@
 
 class ClientHttpBinIntegrationTest extends AsyncTestCase
 {
-    private Socket\SocketServer $socket;
+    private Socket\ServerSocket $socket;
 
     private HttpClient $client;
 

test/Connection/Http1ConnectionTest.php

@@ -104,7 +104,7 @@ public function testUpgrade(): void
         $socketData = "Data that should be sent after the upgrade response";
 
         $invoked = false;
-        $callback = function (Socket\EncryptableSocket $socket, Request $request, Response $response) use (
+        $callback = function (Socket\Socket $socket, Request $request, Response $response) use (
             &$invoked,
             $socketData
         ) {

test/ConnectionPoolTest.php

@@ -11,7 +11,7 @@
 
 class ConnectionPoolTest extends AsyncTestCase
 {
-    private Socket\SocketServer $socket;
+    private Socket\ServerSocket $socket;
 
     private HttpClient $client;
 

test/Interceptor/InterceptorTest.php

@@ -19,8 +19,8 @@
 use Amp\Http\Server\SocketHttpServer;
 use Amp\PHPUnit\AsyncTestCase;
 use Amp\Socket\InternetAddress;
+use Amp\Socket\ServerSocket;
 use Amp\Socket\SocketAddress;
-use Amp\Socket\SocketServer;
 use Amp\Socket\StaticSocketConnector;
 use Psr\Log\NullLogger;
 use function Amp\Socket\socketConnector;
@@ -31,7 +31,7 @@ abstract class InterceptorTest extends AsyncTestCase
 
     private HttpClient $client;
 
-    private SocketServer $serverSocket;
+    private ServerSocket $serverSocket;
 
     private HttpServer $server;
 

test/TimeoutTest.php

@@ -67,7 +67,7 @@ public function testTimeoutDuringConnect(): void
             ->willReturnCallback(function (
                 string $uri,
                 ?Socket\ConnectContext $connectContext = null
-            ): Socket\EncryptableSocket {
+            ): Socket\Socket {
                 $this->assertNotNull($connectContext);
                 $this->assertSame(0.001, $connectContext->getConnectTimeout());
 
@@ -195,7 +195,7 @@ public function testTimeoutDuringConnectInterceptor(): void
             ->willReturnCallback(function (
                 string $uri,
                 ?Socket\ConnectContext $connectContext = null
-            ): Socket\EncryptableSocket {
+            ): Socket\Socket {
                 $this->assertNotNull($connectContext);
                 $this->assertSame(0.001, $connectContext->getConnectTimeout());