mirrors/nadeko_invidious
1
0
Fork 0
mirror of https://git.nadeko.net/Fijxu/invidious.git synced 2025-12-19 11:28:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Automatically initialize proxy via stdlib override

Browse Source
This commit is contained in:
syeopite
2023-10-04 14:36:04 -04:00
parent eb8fcc9e88
commit 3b471ae964
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/invidious/yt_backend/connection_pool.cr
View File

@@ -26,13 +26,15 @@ struct YoutubeConnectionPool
def client(&block)
conn = pool.checkout
# Proxy needs to be reinstated every time we get a client from the pool
conn.proxy = make_configured_http_proxy_client() if CONFIG.http_proxy
begin
response = yield conn
rescue ex
conn.close
conn = HTTP::Client.new(url)
conn = HTTP::Client.new(url)
conn.proxy = make_configured_http_proxy_client() if CONFIG.http_proxy
conn.family = CONFIG.force_resolve
conn.family = Socket::Family::INET if conn.family == Socket::Family::UNSPEC
@@ -48,7 +50,6 @@ struct YoutubeConnectionPool
private def build_pool
DB::Pool(HTTP::Client).new(initial_pool_size: 0, max_pool_size: capacity, max_idle_pool_size: capacity, checkout_timeout: timeout) do
conn = HTTP::Client.new(url)
conn.proxy = make_configured_http_proxy_client() if CONFIG.http_proxy
conn.family = CONFIG.force_resolve
conn.family = Socket::Family::INET if conn.family == Socket::Family::UNSPEC
conn.before_request { |r| add_yt_headers(r) } if url.host == "www.youtube.com"
@@ -69,8 +70,6 @@ def make_client(url : URI, region = nil, force_resolve : Bool = false)
client.read_timeout = 10.seconds
client.connect_timeout = 10.seconds
client.proxy = make_configured_http_proxy_client() if CONFIG.http_proxy
return client
end