mirror of
https://gitea.invidious.io/iv-org/invidious.git
synced 2024-08-15 00:53:41 +00:00
Remove lsquic from codebase
This commit is contained in:
parent
d956b1826e
commit
c5fe96e936
8 changed files with 32 additions and 193 deletions
|
@ -140,27 +140,6 @@ https_only: false
|
|||
##
|
||||
#pool_size: 100
|
||||
|
||||
##
|
||||
## Enable/Disable the use of QUIC (HTTP/3) when connecting
|
||||
## to the youtube API and websites ('youtube.com', 'ytimg.com').
|
||||
## QUIC's main advantages are its lower latency and lower bandwidth
|
||||
## use, compared to its predecessors. However, the current version
|
||||
## of QUIC used in invidious is still based on the IETF draft 31,
|
||||
## meaning that the underlying library may still not be fully
|
||||
## optimized. You can read more about QUIC at the link below:
|
||||
## https://datatracker.ietf.org/doc/html/draft-ietf-quic-transport-31
|
||||
##
|
||||
## Note: you should try both options and see what is the best for your
|
||||
## instance. In general QUIC is recommended for public instances. Your
|
||||
## mileage may vary.
|
||||
##
|
||||
## Note 2: Using QUIC prevents some captcha challenges from appearing.
|
||||
## See: https://github.com/iv-org/invidious/issues/957#issuecomment-576424042
|
||||
##
|
||||
## Accepted values: true, false
|
||||
## Default: false
|
||||
##
|
||||
#use_quic: false
|
||||
|
||||
##
|
||||
## Additional cookies to be sent when requesting the youtube API.
|
||||
|
|
|
@ -24,10 +24,6 @@ shards:
|
|||
git: https://github.com/jeromegn/kilt.git
|
||||
version: 0.6.1
|
||||
|
||||
lsquic:
|
||||
git: https://github.com/iv-org/lsquic.cr.git
|
||||
version: 2.18.1-2
|
||||
|
||||
pg:
|
||||
git: https://github.com/will/crystal-pg.git
|
||||
version: 0.24.0
|
||||
|
|
|
@ -25,9 +25,6 @@ dependencies:
|
|||
protodec:
|
||||
github: iv-org/protodec
|
||||
version: ~> 0.1.5
|
||||
lsquic:
|
||||
github: iv-org/lsquic.cr
|
||||
version: ~> 2.18.1-2
|
||||
athena-negotiation:
|
||||
github: athena-framework/negotiation
|
||||
version: ~> 0.1.1
|
||||
|
|
|
@ -90,7 +90,7 @@ SOFTWARE = {
|
|||
"branch" => "#{CURRENT_BRANCH}",
|
||||
}
|
||||
|
||||
YT_POOL = YoutubeConnectionPool.new(YT_URL, capacity: CONFIG.pool_size, use_quic: CONFIG.use_quic)
|
||||
YT_POOL = YoutubeConnectionPool.new(YT_URL, capacity: CONFIG.pool_size)
|
||||
|
||||
# CLI
|
||||
Kemal.config.extra_options do |parser|
|
||||
|
|
|
@ -126,8 +126,6 @@ class Config
|
|||
property host_binding : String = "0.0.0.0"
|
||||
# Pool size for HTTP requests to youtube.com and ytimg.com (each domain has a separate pool of `pool_size`)
|
||||
property pool_size : Int32 = 100
|
||||
# Use quic transport for youtube api
|
||||
property use_quic : Bool = false
|
||||
|
||||
# Saved cookies in "name1=value1; name2=value2..." format
|
||||
@[YAML::Field(converter: Preferences::StringToCookies)]
|
||||
|
|
|
@ -3,17 +3,7 @@ module Invidious::Routes::Images
|
|||
def self.ggpht(env)
|
||||
url = env.request.path.lchop("/ggpht")
|
||||
|
||||
headers = (
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
HTTP::Headers{":authority" => "yt3.ggpht.com"}
|
||||
else
|
||||
HTTP::Headers.new
|
||||
end
|
||||
{% else %}
|
||||
HTTP::Headers.new
|
||||
{% end %}
|
||||
)
|
||||
headers = HTTP::Headers.new
|
||||
|
||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||
if env.request.headers[header]?
|
||||
|
@ -42,22 +32,9 @@ module Invidious::Routes::Images
|
|||
}
|
||||
|
||||
begin
|
||||
{% 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("https://yt3.ggpht.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("https://yt3.ggpht.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
{% end %}
|
||||
HTTP::Client.get("https://yt3.ggpht.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
@ -78,10 +55,6 @@ module Invidious::Routes::Images
|
|||
|
||||
headers = HTTP::Headers.new
|
||||
|
||||
{% unless flag?(:disable_quic) %}
|
||||
headers[":authority"] = "#{authority}.ytimg.com"
|
||||
{% end %}
|
||||
|
||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||
if env.request.headers[header]?
|
||||
headers[header] = env.request.headers[header]
|
||||
|
@ -107,22 +80,9 @@ module Invidious::Routes::Images
|
|||
}
|
||||
|
||||
begin
|
||||
{% 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("https://#{authority}.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("https://#{authority}.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
{% end %}
|
||||
HTTP::Client.get("https://#{authority}.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
@ -133,17 +93,7 @@ module Invidious::Routes::Images
|
|||
name = env.params.url["name"]
|
||||
url = env.request.resource
|
||||
|
||||
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 %}
|
||||
)
|
||||
headers = HTTP::Headers.new
|
||||
|
||||
REQUEST_HEADERS_WHITELIST.each do |header|
|
||||
if env.request.headers[header]?
|
||||
|
@ -169,22 +119,9 @@ module Invidious::Routes::Images
|
|||
}
|
||||
|
||||
begin
|
||||
{% 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("https://i9.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("https://i9.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
{% end %}
|
||||
HTTP::Client.get("https://i9.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
@ -223,41 +160,16 @@ module Invidious::Routes::Images
|
|||
id = env.params.url["id"]
|
||||
name = env.params.url["name"]
|
||||
|
||||
headers = (
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
HTTP::Headers{":authority" => "i.ytimg.com"}
|
||||
else
|
||||
HTTP::Headers.new
|
||||
end
|
||||
{% else %}
|
||||
HTTP::Headers.new
|
||||
{% end %}
|
||||
)
|
||||
headers = HTTP::Headers.new
|
||||
|
||||
if name == "maxres.jpg"
|
||||
build_thumbnails(id).each do |thumb|
|
||||
thumbnail_resource_path = "/vi/#{id}/#{thumb[:url]}.jpg"
|
||||
# Logic here is short enough that manually typing them out should be fine.
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if CONFIG.use_quic
|
||||
if YT_POOL.client &.head(thumbnail_resource_path, headers).status_code == 200
|
||||
name = thumb[:url] + ".jpg"
|
||||
break
|
||||
end
|
||||
else
|
||||
if HTTP::Client.head("https://i.ytimg.com#{thumbnail_resource_path}").status_code == 200
|
||||
name = thumb[:url] + ".jpg"
|
||||
break
|
||||
end
|
||||
end
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
if HTTP::Client.head("https://i.ytimg.com#{thumbnail_resource_path}").status_code == 200
|
||||
name = thumb[:url] + ".jpg"
|
||||
break
|
||||
end
|
||||
{% end %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
if HTTP::Client.head("https://i.ytimg.com#{thumbnail_resource_path}").status_code == 200
|
||||
name = thumb[:url] + ".jpg"
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -287,22 +199,10 @@ module Invidious::Routes::Images
|
|||
}
|
||||
|
||||
begin
|
||||
{% 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("https://i.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
end
|
||||
{% else %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("https://i.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
{% end %}
|
||||
# This can likely be optimized into a (small) pool sometime in the future.
|
||||
HTTP::Client.get("https://i.ytimg.com#{url}") do |resp|
|
||||
return request_proc.call(resp)
|
||||
end
|
||||
rescue ex
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,11 +1,3 @@
|
|||
{% unless flag?(:disable_quic) %}
|
||||
require "lsquic"
|
||||
|
||||
alias HTTPClientType = QUIC::Client | HTTP::Client
|
||||
{% else %}
|
||||
alias HTTPClientType = HTTP::Client
|
||||
{% end %}
|
||||
|
||||
def add_yt_headers(request)
|
||||
if request.headers["User-Agent"] == "Crystal"
|
||||
request.headers["User-Agent"] ||= "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"
|
||||
|
@ -26,11 +18,11 @@ struct YoutubeConnectionPool
|
|||
property! url : URI
|
||||
property! capacity : Int32
|
||||
property! timeout : Float64
|
||||
property pool : DB::Pool(HTTPClientType)
|
||||
property pool : DB::Pool(HTTP::Client)
|
||||
|
||||
def initialize(url : URI, @capacity = 5, @timeout = 5.0, use_quic = true)
|
||||
def initialize(url : URI, @capacity = 5, @timeout = 5.0)
|
||||
@url = url
|
||||
@pool = build_pool(use_quic)
|
||||
@pool = build_pool()
|
||||
end
|
||||
|
||||
def client(region = nil, &block)
|
||||
|
@ -43,11 +35,7 @@ struct YoutubeConnectionPool
|
|||
response = yield conn
|
||||
rescue ex
|
||||
conn.close
|
||||
{% unless flag?(:disable_quic) %}
|
||||
conn = CONFIG.use_quic ? QUIC::Client.new(url) : HTTP::Client.new(url)
|
||||
{% else %}
|
||||
conn = HTTP::Client.new(url)
|
||||
{% end %}
|
||||
conn = HTTP::Client.new(url)
|
||||
|
||||
conn.family = (url.host == "www.youtube.com") ? CONFIG.force_resolve : Socket::Family::INET
|
||||
conn.family = Socket::Family::INET if conn.family == Socket::Family::UNSPEC
|
||||
|
@ -61,19 +49,9 @@ struct YoutubeConnectionPool
|
|||
response
|
||||
end
|
||||
|
||||
private def build_pool(use_quic)
|
||||
DB::Pool(HTTPClientType).new(initial_pool_size: 0, max_pool_size: capacity, max_idle_pool_size: capacity, checkout_timeout: timeout) do
|
||||
conn = nil # Declare
|
||||
{% unless flag?(:disable_quic) %}
|
||||
if use_quic
|
||||
conn = QUIC::Client.new(url)
|
||||
else
|
||||
conn = HTTP::Client.new(url)
|
||||
end
|
||||
{% else %}
|
||||
conn = HTTP::Client.new(url)
|
||||
{% end %}
|
||||
|
||||
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.family = (url.host == "www.youtube.com") ? CONFIG.force_resolve : Socket::Family::INET
|
||||
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"
|
||||
|
@ -83,7 +61,6 @@ struct YoutubeConnectionPool
|
|||
end
|
||||
|
||||
def make_client(url : URI, region = nil)
|
||||
# TODO: Migrate any applicable endpoints to QUIC
|
||||
client = HTTPClient.new(url, OpenSSL::SSL::Context::Client.insecure)
|
||||
client.family = (url.host == "www.youtube.com") ? CONFIG.force_resolve : Socket::Family::UNSPEC
|
||||
client.before_request { |r| add_yt_headers(r) } if url.host == "www.youtube.com"
|
||||
|
|
|
@ -595,17 +595,9 @@ module YoutubeAPI
|
|||
LOGGER.trace("YoutubeAPI: POST data: #{data}")
|
||||
|
||||
# Send the POST request
|
||||
if {{ !flag?(:disable_quic) }} && CONFIG.use_quic
|
||||
# Using QUIC client
|
||||
body = YT_POOL.client(client_config.proxy_region,
|
||||
&.post(url, headers: headers, body: data.to_json)
|
||||
).body
|
||||
else
|
||||
# Using HTTP client
|
||||
body = YT_POOL.client(client_config.proxy_region) do |client|
|
||||
client.post(url, headers: headers, body: data.to_json) do |response|
|
||||
self._decompress(response.body_io, response.headers["Content-Encoding"]?)
|
||||
end
|
||||
body = YT_POOL.client(client_config.proxy_region) do |client|
|
||||
client.post(url, headers: headers, body: data.to_json) do |response|
|
||||
self._decompress(response.body_io, response.headers["Content-Encoding"]?)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue