From f48479a92c3b3931de1e8b82c052532c04edadbe Mon Sep 17 00:00:00 2001 From: htliang128 Date: Sat, 25 May 2024 12:17:46 +0800 Subject: [PATCH 1/3] Update of Socks Proxy adding headers --- .../github/jwdeveloper/tiktok/http/HttpProxyClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java index 92d9ace..4be4107 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java @@ -105,16 +105,19 @@ public class HttpProxyClient extends HttpClient { socksConnection.setSSLSocketFactory(sc.getSocketFactory()); socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart()); socksConnection.setReadTimeout(httpClientSettings.getTimeout().toMillisPart()); - + Map requestHeaders = httpClientSettings.getHeaders(); + for (Map.Entry entry : requestHeaders.entrySet()) { + socksConnection.setRequestProperty(entry.getKey(), entry.getValue()); + } byte[] body = socksConnection.getInputStream().readAllBytes(); - Map> headers = socksConnection.getHeaderFields() + Map> responseHeaders = socksConnection.getHeaderFields() .entrySet() .stream() .filter(entry -> entry.getKey() != null) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - var responseInfo = createResponseInfo(socksConnection.getResponseCode(), headers); + var responseInfo = createResponseInfo(socksConnection.getResponseCode(), responseHeaders); var response = createHttpResponse(body, toUrl(), responseInfo); From bd0a1f0d01058fc2388743e11888c3bc1fa0da1d Mon Sep 17 00:00:00 2001 From: htliang128 Date: Sat, 25 May 2024 12:20:57 +0800 Subject: [PATCH 2/3] Update of Socks Proxy adding headers --- .../io/github/jwdeveloper/tiktok/http/HttpProxyClient.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java index 4be4107..b3dcf8d 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java @@ -106,9 +106,7 @@ public class HttpProxyClient extends HttpClient { socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart()); socksConnection.setReadTimeout(httpClientSettings.getTimeout().toMillisPart()); Map requestHeaders = httpClientSettings.getHeaders(); - for (Map.Entry entry : requestHeaders.entrySet()) { - socksConnection.setRequestProperty(entry.getKey(), entry.getValue()); - } + requestHeaders.forEach(socksConnection::setRequestProperty); byte[] body = socksConnection.getInputStream().readAllBytes(); Map> responseHeaders = socksConnection.getHeaderFields() From 919554bbc82416ade2f1918769e5821fd89594c0 Mon Sep 17 00:00:00 2001 From: htliang128 Date: Sat, 25 May 2024 12:22:31 +0800 Subject: [PATCH 3/3] Update of Socks Proxy adding headers --- .../github/jwdeveloper/tiktok/http/HttpProxyClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java index b3dcf8d..771234e 100644 --- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java +++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/HttpProxyClient.java @@ -105,17 +105,17 @@ public class HttpProxyClient extends HttpClient { socksConnection.setSSLSocketFactory(sc.getSocketFactory()); socksConnection.setConnectTimeout(httpClientSettings.getTimeout().toMillisPart()); socksConnection.setReadTimeout(httpClientSettings.getTimeout().toMillisPart()); - Map requestHeaders = httpClientSettings.getHeaders(); - requestHeaders.forEach(socksConnection::setRequestProperty); + httpClientSettings.getHeaders().forEach(socksConnection::setRequestProperty); + byte[] body = socksConnection.getInputStream().readAllBytes(); - Map> responseHeaders = socksConnection.getHeaderFields() + Map> headers = socksConnection.getHeaderFields() .entrySet() .stream() .filter(entry -> entry.getKey() != null) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); - var responseInfo = createResponseInfo(socksConnection.getResponseCode(), responseHeaders); + var responseInfo = createResponseInfo(socksConnection.getResponseCode(), headers); var response = createHttpResponse(body, toUrl(), responseInfo);