Wrap TimeoutException and DNS resolution exceptions to ConnectException, all other exceptions to RequestException.

Author: luzrain

src/GuzzleHandlerAdapter.php

@@ -6,6 +6,7 @@
 use Amp\Cancellation;
 use Amp\CancelledException;
 use Amp\DeferredCancellation;
+use Amp\Dns\DnsException;
 use Amp\Dns\DnsRecord;
 use Amp\File\File;
 use Amp\File\FilesystemException;
@@ -17,7 +18,7 @@
 use Amp\Http\Client\Psr7\PsrHttpClientException;
 use Amp\Http\Client\Request as AmpRequest;
 use Amp\Http\Client\Response;
-use Amp\Http\Client\SocketException;
+use Amp\Http\Client\TimeoutException;
 use Amp\Http\Tunnel\Http1TunnelConnector;
 use Amp\Http\Tunnel\Https1TunnelConnector;
 use Amp\Socket\Certificate;
@@ -27,6 +28,7 @@
 use Amp\Socket\Socks5SocketConnector;
 use AssertionError;
 use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\Request as GuzzleRequest;
@@ -140,9 +142,16 @@ function () use (&$promise, $future, $cancellation, $deferredCancellation, $requ
                     if (!$cancellation->isRequested()) {
                         $promise->reject($e);
                     }
-                } catch (SocketException $e) {
-                    $promise->reject(new ConnectException($e->getMessage(), $request, $e));
                 } catch (\Throwable $e) {
+                    if ($e instanceof TimeoutException) {
+                        $e = new ConnectException($e->getMessage(), $request, $e);
+                    } elseif ($e->getPrevious()?->getPrevious() instanceof DnsException) {
+                        // Wrap DNS resolution exception to ConnectException
+                        $e = new ConnectException($e->getPrevious()->getMessage(), $request, $e);
+                    } else {
+                        $e = RequestException::wrapException($request, $e);
+                    }
+
                     $promise->reject($e);
                 }
             },