Skip to content

Convert SocketException to guzzle ConnectException #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 1.x
Choose a base branch
from
+14 −1
Open

Convert SocketException to guzzle ConnectException #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
377ff7d
Convert SocketException to guzzle ConnectException
luzrain Feb 24, 2025
8068f2c
Wrap TimeoutException and DNS resolution exceptions to ConnectExcepti…
luzrain Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/GuzzleHandlerAdapter.php
View file
Original file line number Diff line number Diff line change
@@ -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,6 +18,7 @@
use Amp\Http\Client\Psr7\PsrHttpClientException;
use Amp\Http\Client\Request as AmpRequest;
use Amp\Http\Client\Response;
use Amp\Http\Client\TimeoutException;
use Amp\Http\Tunnel\Http1TunnelConnector;
use Amp\Http\Tunnel\Https1TunnelConnector;
use Amp\Socket\Certificate;
@@ -25,6 +27,8 @@
use Amp\Socket\SocketConnector;
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;
@@ -121,7 +125,7 @@ public function __invoke(PsrRequest $request, array $options): PromiseInterface

/** @psalm-suppress UndefinedVariable Using $promise reference in definition expression. */
$promise = new Promise(
function () use (&$promise, $future, $cancellation, $deferredCancellation): void {
function () use (&$promise, $future, $cancellation, $deferredCancellation, $request): void {
if ($deferredCancellation->isCancelled()) {
return;
}
@@ -139,6 +143,15 @@ function () use (&$promise, $future, $cancellation, $deferredCancellation): void
$promise->reject($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);
}
},