Async的proxy模式暂时无法实现

dbstar-org · Mar 20, 2023 · 8b78b3f · 8b78b3f
1 parent 34f1bef
commit 8b78b3f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/main/java/io/github/dbstarll/utils/http/client/HttpClientFactory.java b/src/main/java/io/github/dbstarll/utils/http/client/HttpClientFactory.java
@@ -179,10 +179,9 @@ private AsyncClientConnectionManager buildConnectionManagerAsync() {
         if (sslContext != null) {
             builder.setTlsStrategy(ClientTlsStrategyBuilder.create().setSslContext(sslContext).build());
         }
-        // Async的proxy模式暂时无法实现
-//        if (proxy != null && proxy.type() == Type.SOCKS && resolveFromProxy) {
-//            builder.setDnsResolver(new FakeDnsResolver());
-//        }
+        if (proxy != null && proxy.type() == Type.SOCKS && resolveFromProxy) {
+            builder.setDnsResolver(new FakeDnsResolver());
+        }
         return builder.build();
     }
 

diff --git a/src/test/java/io/github/dbstarll/utils/http/client/HttpClientFactoryTest.java b/src/test/java/io/github/dbstarll/utils/http/client/HttpClientFactoryTest.java
@@ -45,6 +45,7 @@
 import org.junit.jupiter.api.function.ThrowingConsumer;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.Authenticator;
@@ -256,17 +257,21 @@ void proxy() throws Throwable {
         }
     }
 
-//    @Test
-//    void proxyAsync() throws Throwable {
-//        try (CloseableHttpAsyncClient client = new HttpClientFactory().setSocketTimeout(5000).setConnectTimeout(5000)
-//                .setProxy(HttpClientFactory.proxy(Type.SOCKS, PROXY_HOST, PROXY_PORT))
-//                .buildAsync()) {
-//            client.start();
-//            final SimpleHttpRequest request = SimpleRequestBuilder.get("https://static.y1cloud.com/ping.html").build();
-//            final Future<SimpleHttpResponse> future = client.execute(request, null);
+    @Test
+    void proxyAsync() throws Throwable {
+        try (CloseableHttpAsyncClient client = new HttpClientFactory().setSocketTimeout(5000).setConnectTimeout(5000)
+                .setProxy(HttpClientFactory.proxy(Type.SOCKS, PROXY_HOST, PROXY_PORT))
+                .buildAsync()) {
+            client.start();
+            final SimpleHttpRequest request = SimpleRequestBuilder.get("https://static.y1cloud.com/ping.html").build();
+            final Future<SimpleHttpResponse> future = client.execute(request, null);
 //            assertEquals("ok\n", future.get().getBodyText());
-//        }
-//    }
+            // Async模式下的proxy还有问题
+            final ExecutionException e = assertThrowsExactly(ExecutionException.class, future::get);
+            assertNotNull(e.getCause());
+            assertSame(SSLHandshakeException.class, e.getCause().getClass());
+        }
+    }
 
     @Test
     void proxyWithContext() throws Throwable {