Require amphp/http-tunnel and switch to Socks5SocketConnector

amphp · Feb 10, 2025 · 95581a7 · 95581a7
1 parent 7e59a4a
commit 95581a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -38,11 +38,11 @@
         "guzzlehttp/psr7": "^1 || ^2",
         "psr/http-message": "^1.1 || ^2",
         "psr/http-factory-implementation": "^1",
-        "revolt/event-loop": "^1"
+        "revolt/event-loop": "^1",
+        "amphp/http-tunnel": "^2.0"
     },
     "require-dev": {
         "amphp/file": "^3.0",
-        "amphp/http-tunnel": "^2",
         "amphp/php-cs-fixer-config": "^2",
         "amphp/phpunit-util": "^3",
         "phpunit/phpunit": "^9",

diff --git a/src/GuzzleHandlerAdapter.php b/src/GuzzleHandlerAdapter.php
@@ -24,6 +24,7 @@
 use Amp\Socket\ClientTlsContext;
 use Amp\Socket\ConnectContext;
 use Amp\Socket\SocketConnector;
+use Amp\Socket\Socks5SocketConnector;
 use AssertionError;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
@@ -251,7 +252,7 @@ private static function getConnector(AmpRequest $request, array $options): ?Sock
             if ($userInfo !== '') {
                 [$user, $password] = \explode(':', $userInfo, 2) + [null, null];
             }
-            return new Socks5TunnelConnector($uri->getHost() . ':' . $uri->getPort(), $user, $password);
+            return new Socks5SocketConnector($uri->getHost() . ':' . $uri->getPort(), $user, $password);
         }
 
         $headers = [];