Make force_resolve false by default in make_client

This commit is contained in:
syeopite 2024-01-08 14:20:49 -08:00
parent 815a1c2cc4
commit 583a5fce64
No known key found for this signature in database
GPG Key ID: A73C186DA3955A1A
4 changed files with 10 additions and 10 deletions

View File

@ -256,13 +256,13 @@ module Invidious::Routes::API::V1::Videos
file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml") file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml")
location = make_client(ARCHIVE_URL, force_resolve: false, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}")) location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))
if !location.headers["Location"]? if !location.headers["Location"]?
env.response.status_code = location.status_code env.response.status_code = location.status_code
end end
response = make_client(URI.parse(location.headers["Location"]), force_resolve: false, &.get(location.headers["Location"])) response = make_client(URI.parse(location.headers["Location"]), &.get(location.headers["Location"]))
if response.body.empty? if response.body.empty?
haltf env, 404 haltf env, 404

View File

@ -42,7 +42,7 @@ module Invidious::Routes::VideoPlayback
headers["Range"] = "bytes=#{range_for_head}" headers["Range"] = "bytes=#{range_for_head}"
end end
client = make_client(URI.parse(host), region) client = make_client(URI.parse(host), region, force_resolve = true)
response = HTTP::Client::Response.new(500) response = HTTP::Client::Response.new(500)
error = "" error = ""
5.times do 5.times do
@ -57,7 +57,7 @@ module Invidious::Routes::VideoPlayback
if new_host != host if new_host != host
host = new_host host = new_host
client.close client.close
client = make_client(URI.parse(new_host), region) client = make_client(URI.parse(new_host), region, force_resolve = true)
end end
url = "#{location.request_target}&host=#{location.host}#{region ? "&region=#{region}" : ""}" url = "#{location.request_target}&host=#{location.host}#{region ? "&region=#{region}" : ""}"
@ -71,7 +71,7 @@ module Invidious::Routes::VideoPlayback
fvip = "3" fvip = "3"
host = "https://r#{fvip}---#{mn}.googlevideo.com" host = "https://r#{fvip}---#{mn}.googlevideo.com"
client = make_client(URI.parse(host), region) client = make_client(URI.parse(host), region, force_resolve = true)
rescue ex rescue ex
error = ex.message error = ex.message
end end
@ -196,7 +196,7 @@ module Invidious::Routes::VideoPlayback
break break
else else
client.close client.close
client = make_client(URI.parse(host), region) client = make_client(URI.parse(host), region, force_resolve = true)
end end
end end

View File

@ -62,7 +62,7 @@ struct Invidious::User
end end
def generate_text(key) def generate_text(key)
response = make_client(TEXTCAPTCHA_URL, force_resolve: false, &.get("/github.com/iv.org/invidious.json").body) response = make_client(TEXTCAPTCHA_URL, &.get("/github.com/iv.org/invidious.json").body)
response = JSON.parse(response) response = JSON.parse(response)
tokens = response["a"].as_a.map do |answer| tokens = response["a"].as_a.map do |answer|

View File

@ -26,7 +26,7 @@ struct YoutubeConnectionPool
def client(region = nil, &block) def client(region = nil, &block)
if region if region
conn = make_client(url, region) conn = make_client(url, region, force_resolve = true)
response = yield conn response = yield conn
else else
conn = pool.checkout conn = pool.checkout
@ -59,7 +59,7 @@ struct YoutubeConnectionPool
end end
end end
def make_client(url : URI, region = nil, force_resolve : Bool = true) def make_client(url : URI, region = nil, force_resolve : Bool = false)
client = HTTPClient.new(url, OpenSSL::SSL::Context::Client.insecure) client = HTTPClient.new(url, OpenSSL::SSL::Context::Client.insecure)
# Some services do not support IPv6. # Some services do not support IPv6.
@ -85,7 +85,7 @@ def make_client(url : URI, region = nil, force_resolve : Bool = true)
return client return client
end end
def make_client(url : URI, region = nil, force_resolve : Bool = true, &block) def make_client(url : URI, region = nil, force_resolve : Bool = false, &block)
client = make_client(url, region, force_resolve) client = make_client(url, region, force_resolve)
begin begin
yield client yield client