mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-03-16.git
synced 2024-08-15 00:53:18 +00:00
Allow storyboard queries with QUIC disabled
This commit is contained in:
parent
c3747c2d49
commit
6b8450558d
1 changed files with 76 additions and 32 deletions
|
@ -78,7 +78,9 @@ module Invidious::Routes::Images
|
|||
|
||||
headers = HTTP::Headers.new
|
||||
|
||||
headers[":authority"] = "#{authority}.ytimg.com"
|
||||
{% unless flag?(:disable_quic) %}
|
||||
headers[":authority"] = "#{authority}.ytimg.com"
|
||||
{% end %}
|
||||
|
||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||
if env.request.headers[header]?
|
||||
|
@ -86,25 +88,41 @@ module Invidious::Routes::Images
|
|||
end
|
||||
end
|
||||
|
||||
request_proc = ->(response : HTTP::Client::Response) {
|
||||
env.response.status_code = response.status_code
|
||||
response.headers.each do |key, value|
|
||||
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
||||
env.response.headers[key] = value
|
||||
end
|
||||
end
|
||||
|
||||
env.response.headers["Connection"] = "close"
|
||||
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
||||
|
||||
if response.status_code >= 300
|
||||
return env.response.headers.delete("Transfer-Encoding")
|
||||
end
|
||||
|
||||
proxy_file(response, env)
|
||||
}
|
||||
|
||||
begin
|
||||
YT_POOL.client &.get(url, headers) do |response|
|
||||
env.response.status_code = response.status_code
|
||||
response.headers.each do |key, value|
|
||||
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
||||
env.response.headers[key] = value
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
YT_POOL.client &.get(url, headers) do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
else
|
||||
HTTP::Client.get("#{authority}.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
|
||||
env.response.headers["Connection"] = "close"
|
||||
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
||||
|
||||
if response.status_code >= 300
|
||||
env.response.headers.delete("Transfer-Encoding")
|
||||
break
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("#{authority}.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
|
||||
proxy_file(response, env)
|
||||
end
|
||||
{% end %}
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
@ -113,34 +131,60 @@ module Invidious::Routes::Images
|
|||
def self.s_p_image(env)
|
||||
id = env.params.url["id"]
|
||||
name = env.params.url["name"]
|
||||
|
||||
url = env.request.resource
|
||||
|
||||
headers = HTTP::Headers{":authority" => "i9.ytimg.com"}
|
||||
headers = (
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
HTTP::Headers{":authority" => "i9.ytimg.com"}
|
||||
else
|
||||
HTTP::Headers.new
|
||||
end
|
||||
{% else %}
|
||||
HTTP::Headers.new
|
||||
{% end %}
|
||||
)
|
||||
|
||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||
if env.request.headers[header]?
|
||||
headers[header] = env.request.headers[header]
|
||||
end
|
||||
end
|
||||
|
||||
request_proc = ->(response : HTTP::Client::Response) {
|
||||
env.response.status_code = response.status_code
|
||||
response.headers.each do |key, value|
|
||||
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
||||
env.response.headers[key] = value
|
||||
end
|
||||
end
|
||||
|
||||
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
||||
|
||||
if response.status_code >= 300 && response.status_code != 404
|
||||
return env.response.headers.delete("Transfer-Encoding")
|
||||
end
|
||||
|
||||
proxy_file(response, env)
|
||||
}
|
||||
|
||||
begin
|
||||
YT_POOL.client &.get(url, headers) do |response|
|
||||
env.response.status_code = response.status_code
|
||||
response.headers.each do |key, value|
|
||||
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
|
||||
env.response.headers[key] = value
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
YT_POOL.client &.get(url, headers) do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
else
|
||||
HTTP::Client.get("i9.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
|
||||
env.response.headers["Access-Control-Allow-Origin"] = "*"
|
||||
|
||||
if response.status_code >= 300 && response.status_code != 404
|
||||
env.response.headers.delete("Transfer-Encoding")
|
||||
break
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("i9.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
|
||||
proxy_file(response, env)
|
||||
end
|
||||
{% end %}
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue