mirror of
https://github.com/iv-org/invidious.git
synced 2024-11-24 22:47:19 +00:00
add support for invidious companion
This commit is contained in:
parent
9892604758
commit
3dff7a76cf
@ -54,6 +54,22 @@ db:
|
|||||||
##
|
##
|
||||||
#signature_server:
|
#signature_server:
|
||||||
|
|
||||||
|
##
|
||||||
|
## Path to the Invidious companion.
|
||||||
|
## An external program for loading the video streams from YouTube servers.
|
||||||
|
##
|
||||||
|
## When this setting is commented out, Invidious companion is not used.
|
||||||
|
##
|
||||||
|
## When this setting is configured and "external_port" is used then
|
||||||
|
## you need to configure Invidious companion routes into your reverse proxy.
|
||||||
|
## If "external_port" is not configured then Invidious will proxy the requests
|
||||||
|
## to Invidious companion.
|
||||||
|
##
|
||||||
|
## Accepted values: "http(s)://<IP-HOSTNAME>:<Port>"
|
||||||
|
## Default: <none>
|
||||||
|
##
|
||||||
|
#invidious_companion:
|
||||||
|
|
||||||
|
|
||||||
#########################################
|
#########################################
|
||||||
#
|
#
|
||||||
|
@ -151,6 +151,9 @@ class Config
|
|||||||
# poToken for passing bot attestation
|
# poToken for passing bot attestation
|
||||||
property po_token : String? = nil
|
property po_token : String? = nil
|
||||||
|
|
||||||
|
# Invidious companion
|
||||||
|
property invidious_companion : String? = nil
|
||||||
|
|
||||||
# Saved cookies in "name1=value1; name2=value2..." format
|
# Saved cookies in "name1=value1; name2=value2..." format
|
||||||
@[YAML::Field(converter: Preferences::StringToCookies)]
|
@[YAML::Field(converter: Preferences::StringToCookies)]
|
||||||
property cookies : HTTP::Cookies = HTTP::Cookies.new
|
property cookies : HTTP::Cookies = HTTP::Cookies.new
|
||||||
|
@ -100,6 +100,7 @@ def extract_video_info(video_id : String)
|
|||||||
params = parse_video_info(video_id, player_response)
|
params = parse_video_info(video_id, player_response)
|
||||||
params["reason"] = JSON::Any.new(reason) if reason
|
params["reason"] = JSON::Any.new(reason) if reason
|
||||||
|
|
||||||
|
if CONFIG.invidious_companion.nil?
|
||||||
new_player_response = nil
|
new_player_response = nil
|
||||||
|
|
||||||
# Don't use Android test suite client if po_token is passed because po_token doesn't
|
# Don't use Android test suite client if po_token is passed because po_token doesn't
|
||||||
@ -122,6 +123,8 @@ def extract_video_info(video_id : String)
|
|||||||
player_response = new_player_response
|
player_response = new_player_response
|
||||||
params.delete("reason")
|
params.delete("reason")
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
{"captions", "playabilityStatus", "playerConfig", "storyboards"}.each do |f|
|
{"captions", "playabilityStatus", "playerConfig", "storyboards"}.each do |f|
|
||||||
params[f] = player_response[f] if player_response[f]?
|
params[f] = player_response[f] if player_response[f]?
|
||||||
|
@ -615,12 +615,19 @@ module YoutubeAPI
|
|||||||
|
|
||||||
headers = HTTP::Headers{
|
headers = HTTP::Headers{
|
||||||
"Content-Type" => "application/json; charset=UTF-8",
|
"Content-Type" => "application/json; charset=UTF-8",
|
||||||
"Accept-Encoding" => "gzip, deflate",
|
|
||||||
"x-goog-api-format-version" => "2",
|
"x-goog-api-format-version" => "2",
|
||||||
"x-youtube-client-name" => client_config.name_proto,
|
"x-youtube-client-name" => client_config.name_proto,
|
||||||
"x-youtube-client-version" => client_config.version,
|
"x-youtube-client-version" => client_config.version,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if CONFIG.invidious_companion && endpoint == "/youtubei/v1/player"
|
||||||
|
headers["Authorization"] = "Bearer " + CONFIG.hmac_key
|
||||||
|
end
|
||||||
|
|
||||||
|
if !CONFIG.invidious_companion
|
||||||
|
headers["Accept-Encoding"] = "gzip, deflate"
|
||||||
|
end
|
||||||
|
|
||||||
if user_agent = client_config.user_agent
|
if user_agent = client_config.user_agent
|
||||||
headers["User-Agent"] = user_agent
|
headers["User-Agent"] = user_agent
|
||||||
end
|
end
|
||||||
@ -634,7 +641,17 @@ module YoutubeAPI
|
|||||||
LOGGER.trace("YoutubeAPI: ClientConfig: #{client_config}")
|
LOGGER.trace("YoutubeAPI: ClientConfig: #{client_config}")
|
||||||
LOGGER.trace("YoutubeAPI: POST data: #{data}")
|
LOGGER.trace("YoutubeAPI: POST data: #{data}")
|
||||||
|
|
||||||
|
invidious_companion_url = CONFIG.invidious_companion
|
||||||
|
|
||||||
# Send the POST request
|
# Send the POST request
|
||||||
|
if invidious_companion_url && endpoint == "/youtubei/v1/player"
|
||||||
|
begin
|
||||||
|
body = make_client(URI.parse(invidious_companion_url),
|
||||||
|
&.post(endpoint, headers: headers, body: data.to_json).body)
|
||||||
|
rescue
|
||||||
|
raise InfoException.new("Unable to communicate with Invidious companion.")
|
||||||
|
end
|
||||||
|
else
|
||||||
body = YT_POOL.client() do |client|
|
body = YT_POOL.client() do |client|
|
||||||
client.post(url, headers: headers, body: data.to_json) do |response|
|
client.post(url, headers: headers, body: data.to_json) do |response|
|
||||||
if response.status_code != 200
|
if response.status_code != 200
|
||||||
@ -645,6 +662,11 @@ module YoutubeAPI
|
|||||||
self._decompress(response.body_io, response.headers["Content-Encoding"]?)
|
self._decompress(response.body_io, response.headers["Content-Encoding"]?)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if body.nil? && invidious_companion_url
|
||||||
|
raise InfoException.new("Unable to communicate with Invidious companion.")
|
||||||
|
end
|
||||||
|
|
||||||
# Convert result to Hash
|
# Convert result to Hash
|
||||||
initial_data = JSON.parse(body).as_h
|
initial_data = JSON.parse(body).as_h
|
||||||
|
Loading…
Reference in New Issue
Block a user