TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for outbound http proxy

Browse source
This commit is contained in:
3nprob 2021-08-14 01:16:01 +09:00
parent a0c5898f4d
commit 3a6df12844
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config.properties
View file

@ -7,6 +7,9 @@ HTTP_WORKERS: 2
# Proxy # Proxy
PROXY_PART: https://pipedproxy-ams.kavin.rocks PROXY_PART: https://pipedproxy-ams.kavin.rocks
# Ougoing HTTP proxy host:port (for both https and http requests)
HTTP_PROXY:
# Captcha Parameters # Captcha Parameters
CAPTCHA_BASE_URL: https://api.capmonster.cloud/ CAPTCHA_BASE_URL: https://api.capmonster.cloud/
CAPTCHA_API_KEY: INSERT_HERE CAPTCHA_API_KEY: INSERT_HERE

25
src/main/java/me/kavin/piped/consts/Constants.java
View file

@ -2,8 +2,12 @@ package me.kavin.piped.consts;
import java.io.FileReader; import java.io.FileReader;
import java.net.http.HttpClient; import java.net.http.HttpClient;
import java.net.http.HttpClient.Builder;
import java.net.http.HttpClient.Redirect; import java.net.http.HttpClient.Redirect;
import java.net.http.HttpClient.Version; import java.net.http.HttpClient.Version;
import java.net.ProxySelector;
import java.net.InetSocketAddress;
import java.util.Properties; import java.util.Properties;
import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.NewPipe;
@ -32,10 +36,10 @@ public class Constants {
public static final String PUBLIC_URL; public static final String PUBLIC_URL;
public static final HttpClient h2client = HttpClient.newBuilder().followRedirects(Redirect.NORMAL) public static final String HTTP_PROXY;
.version(Version.HTTP_2).build();
public static final HttpClient h2_no_redir_client = HttpClient.newBuilder().followRedirects(Redirect.NEVER) public static final HttpClient h2client;
.version(Version.HTTP_2).build(); public static final HttpClient h2_no_redir_client;
// public static final HttpClient h3client = Http3ClientBuilder.newBuilder().followRedirects(Redirect.NORMAL).build(); // public static final HttpClient h3client = Http3ClientBuilder.newBuilder().followRedirects(Redirect.NORMAL).build();
public static final ObjectMapper mapper = new ObjectMapper().addMixIn(Page.class, PageMixin.class); public static final ObjectMapper mapper = new ObjectMapper().addMixIn(Page.class, PageMixin.class);
@ -54,11 +58,24 @@ public class Constants {
CAPTCHA_BASE_URL = prop.getProperty("CAPTCHA_BASE_URL"); CAPTCHA_BASE_URL = prop.getProperty("CAPTCHA_BASE_URL");
CAPTCHA_API_KEY = prop.getProperty("CAPTCHA_API_KEY"); CAPTCHA_API_KEY = prop.getProperty("CAPTCHA_API_KEY");
PUBLIC_URL = prop.getProperty("API_URL"); PUBLIC_URL = prop.getProperty("API_URL");
HTTP_PROXY = prop.getProperty("HTTP_PROXY");
prop.forEach((_key, _value) -> { prop.forEach((_key, _value) -> {
String key = String.valueOf(_key), value = String.valueOf(_value); String key = String.valueOf(_key), value = String.valueOf(_value);
if (key.startsWith("hibernate")) if (key.startsWith("hibernate"))
hibernateProperties.put(key, value); hibernateProperties.put(key, value);
}); });
Builder h2c = HttpClient.newBuilder().followRedirects(Redirect.NORMAL)
.version(Version.HTTP_2);
Builder h2nrc = HttpClient.newBuilder().followRedirects(Redirect.NEVER)
.version(Version.HTTP_2);
if (HTTP_PROXY != null && !HTTP_PROXY.trim().isEmpty()) {
String[] parts = HTTP_PROXY.split(":");
ProxySelector proxy = ProxySelector.of(new InetSocketAddress(parts[0], Integer.parseInt(parts[1])));
h2c = h2c.proxy(proxy);
h2nrc = h2nrc.proxy(proxy);
}
h2client = h2c.build();
h2_no_redir_client = h2nrc.build();
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }